Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1bb9457 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide-cd: move lba_to_msf() and msf_to_lba() to <linux/cdrom.h> 



* 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.

Acked-by: default avatarJens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 5c68429d

drivers/cdrom/cdrom.c

+0 −6
Original line number Diff line number Diff line
@@ -2787,12 +2787,6 @@ int cdrom_ioctl(struct file * file, struct cdrom_device_info *cdi, 
	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

drivers/ide/ide-cd.c

+0 −18
Original line number Diff line number Diff line
@@ -1664,24 +1664,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;

include/linux/cdrom.h

+14 −0
Original line number Diff line number Diff line
@@ -1187,6 +1187,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 */