Jens,
The following patch corrects the comments in cdrom.h for CDROMREADRAW, CDROMREADMODE1, and CDROMREADMODE2 that erroneously refer to the cdrom_read structure. With this patch, they refer to the cdrom_msf structure.
--- /usr/src/linux-2.2.17/include/linux/cdrom.h Wed Nov 29 10:34:29 2000
+++ /usr/src/linux-2.2.17rap/include/linux/cdrom.h Thu Nov 30 14:23:32 2000
@@ -66,9 +66,9 @@
#define CDROMSUBCHNL 0x530b /* Read subchannel data
(struct cdrom_subchnl) */
#define CDROMREADMODE2 0x530c /* Read CDROM mode 2 data (2336 Bytes)
- (struct cdrom_read) */
+ (struct cdrom_msf) */
#define CDROMREADMODE1 0x530d /* Read CDROM mode 1 data (2048 Bytes)
- (struct cdrom_read) */
+ (struct cdrom_msf) */
#define CDROMREADAUDIO 0x530e /* (struct cdrom_read_audio) */
#define CDROMEJECT_SW 0x530f /* enable(1)/disable(0) auto-ejecting */
#define CDROMMULTISESSION 0x5310 /* Obtain the start-of-last-session
@@ -82,7 +82,7 @@
#define CDROMVOLREAD 0x5313 /* Get the drive's volume setting
(struct cdrom_volctrl) */
#define CDROMREADRAW 0x5314 /* read data in raw mode (2352 Bytes)
- (struct cdrom_read) */
+ (struct cdrom_msf) */
/*
* These ioctls are used only used in aztcd.c and optcd.c
*/
@@ -159,7 +159,9 @@
int lba;
};
-/* This struct is used by the CDROMPLAYMSF ioctl */
+/* This struct is used by the CDROMPLAYMSF, CDROMREADRAW, CDROMREADMODE1,
+ * and CDROMREADMODE2 ioctls.
+ */
struct cdrom_msf
{
__u8 cdmsf_min0; /* start minute */
@@ -219,8 +221,7 @@
union cdrom_addr cdte_addr;
__u8 cdte_datamode;
};
-
-/* This struct is used by the CDROMREADMODE1, and CDROMREADMODE2 ioctls */
+
struct cdrom_read
{
int cdread_lba;
On Thu, Nov 30 2000, Richard Pries wrote:
> Jens,
>
> The following patch corrects the comments in cdrom.h for CDROMREADRAW,
> CDROMREADMODE1, and CDROMREADMODE2 that erroneously refer to the
> cdrom_read structure. With this patch, they refer to the cdrom_msf
> structure.
Thank you, applied.
--
* Jens Axboe <[email protected]>
* SuSE Labs