On Thu, Dec 20 2007, Bartlomiej Zolnierkiewicz wrote:
>
> * Move lba_to_msf() and msf_to_lba() to <linux/cdrom.h>
> (use 'u8' type instead of 'byte' while at it).
>
> * Remove msf_to_lba() copy from drivers/cdrom/cdrom.c.
>
> Cc: Jens Axboe <axboe@xxxxxxxxx>
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
Acked-by: Jens Axboe <jens.axboe@xxxxxxxxxx>
> ---
> drivers/cdrom/cdrom.c | 6 ------
> drivers/ide/ide-cd.c | 18 ------------------
> include/linux/cdrom.h | 14 ++++++++++++++
> 3 files changed, 14 insertions(+), 24 deletions(-)
>
> Index: b/drivers/cdrom/cdrom.c
> ===================================================================
> --- a/drivers/cdrom/cdrom.c
> +++ b/drivers/cdrom/cdrom.c
> @@ -2787,12 +2787,6 @@ int cdrom_ioctl(struct file * file, stru
> return -ENOSYS;
> }
>
> -static inline
> -int msf_to_lba(char m, char s, char f)
> -{
> - return (((m * CD_SECS) + s) * CD_FRAMES + f) - CD_MSF_OFFSET;
> -}
> -
> /*
> * Required when we need to use READ_10 to issue other than 2048 block
> * reads
> Index: b/drivers/ide/ide-cd.c
> ===================================================================
> --- a/drivers/ide/ide-cd.c
> +++ b/drivers/ide/ide-cd.c
> @@ -1643,24 +1643,6 @@ void msf_from_bcd (struct atapi_msf *msf
> msf->frame = BCD2BIN(msf->frame);
> }
>
> -static inline
> -void lba_to_msf (int lba, byte *m, byte *s, byte *f)
> -{
> - lba += CD_MSF_OFFSET;
> - lba &= 0xffffff; /* negative lbas use only 24 bits */
> - *m = lba / (CD_SECS * CD_FRAMES);
> - lba %= (CD_SECS * CD_FRAMES);
> - *s = lba / CD_FRAMES;
> - *f = lba % CD_FRAMES;
> -}
> -
> -
> -static inline
> -int msf_to_lba (byte m, byte s, byte f)
> -{
> - return (((m * CD_SECS) + s) * CD_FRAMES + f) - CD_MSF_OFFSET;
> -}
> -
> static int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense)
> {
> struct request req;
> Index: b/include/linux/cdrom.h
> ===================================================================
> --- a/include/linux/cdrom.h
> +++ b/include/linux/cdrom.h
> @@ -1184,6 +1184,20 @@ struct media_event_desc {
>
> extern int cdrom_get_media_event(struct cdrom_device_info *cdi, struct media_event_desc *med);
>
> +static inline void lba_to_msf(int lba, u8 *m, u8 *s, u8 *f)
> +{
> + lba += CD_MSF_OFFSET;
> + lba &= 0xffffff; /* negative lbas use only 24 bits */
> + *m = lba / (CD_SECS * CD_FRAMES);
> + lba %= (CD_SECS * CD_FRAMES);
> + *s = lba / CD_FRAMES;
> + *f = lba % CD_FRAMES;
> +}
> +
> +static inline int msf_to_lba(u8 m, u8 s, u8 f)
> +{
> + return (((m * CD_SECS) + s) * CD_FRAMES + f) - CD_MSF_OFFSET;
> +}
> #endif /* End of kernel only stuff */
>
> #endif /* _LINUX_CDROM_H */
--
Jens Axboe
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
