patch-2.0.21 linux/Documentation/cdrom/ide-cd

Next file: linux/Documentation/digiboard.txt
Previous file: linux/CREDITS
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.20/linux/Documentation/cdrom/ide-cd linux/Documentation/cdrom/ide-cd
@@ -182,6 +182,10 @@
   If this is set, the driver will never attempt to lock the door of
   the drive.
 
+CDROM_NBLOCKS_BUFFER
+  This sets the size of the buffer to be used for a CDROMREADAUDIO
+  ioctl.  The default is 8.
+
 TEST
   This presently enables an additional ioctl which enables a user-mode
   program to execute an arbitrary packet command.  See the source for
@@ -366,6 +370,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <linux/cdrom.h>
+#include <linux/ucdrom.h>
 
 
 int
@@ -396,10 +401,10 @@
 	}
 
 	/* load */ 
-	status = ioctl (fd, CDROMLOADFROMSLOT, x_slot);
+	status = ioctl (fd, CDROM_SELECT_DISC, x_slot);
 	if (status != 0) {
 		fprintf (stderr,
-			 "%s: CDROMLOADFROMSLOT ioctl failed for `%s': %s\n",
+			 "%s: CDROM_SELECT_DISC ioctl failed for `%s': %s\n",
 			 program, device, strerror (errno));
 		exit (1);
 	}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov