diff -ur --exclude-from /home/axboe/cdrom/exclude-from /tmp/linux-2.3.18/drivers/block/icside.c linux/drivers/block/icside.c --- /tmp/linux-2.3.18/drivers/block/icside.c Sun Sep 26 20:57:08 1999 +++ linux/drivers/block/icside.c Sun Sep 26 19:36:46 1999 @@ -382,7 +382,8 @@ if (drive->media != ide_disk) return 0; - ide_set_handler(drive, &ide_dma_intr, WAIT_CMD); + drive->timeout = WAIT_CMD; + ide_set_handler(drive, &ide_dma_intr); OUT_BYTE(reading ? WIN_READDMA : WIN_WRITEDMA, IDE_COMMAND_REG); diff -ur --exclude-from /home/axboe/cdrom/exclude-from /tmp/linux-2.3.18/drivers/block/ide-cd.c linux/drivers/block/ide-cd.c --- /tmp/linux-2.3.18/drivers/block/ide-cd.c Sun Sep 26 21:14:31 1999 +++ linux/drivers/block/ide-cd.c Sun Sep 26 21:04:41 1999 @@ -12,11 +12,11 @@ * * Suggestions are welcome. Patches that work are more welcome though. ;-) * For those wishing to work on this driver, please be sure you download - * and comply with the latest Mt. Fuji (SFF8090 version 3) and ATAPI + * and comply with the latest Mt. Fuji (SFF8090 version 4) and ATAPI * (SFF-8020i rev 2.6) standards. These documents can be obtained by * anonymous ftp from: * ftp://fission.dt.wdc.com/pub/standards/SFF/specs/INF-8020.PDF - * ftp://fission.dt.wdc.com/pub/standards/SFF/specs/INF-8090.PDF + * ftp://ftp.avc-pioneer.com/Mtfuji4/Spec/Fuji4r01.pdf * * Drives that deviate from these standards will be accomodated as much * as possible via compile time or command-line options. Since I only have @@ -29,14 +29,8 @@ * This will allow us to get automagically notified when the media changes * on ATAPI drives (something the stock ATAPI spec is lacking). Looks * very cool. I discovered its existance the other day at work... - * -Query the drive to find what features are available before trying to - * use them (like trying to close the tray in drives that can't). * -Make it so that Pioneer CD DR-A24X and friends don't get screwed up on * boot - * -Integrate DVD-ROM support in driver. Thanks to Merete Gotsæd-Petersen - * of Pioneer Denmark for providing me with a drive for testing. - * -Implement Features and Profiles. - * * * ---------------------------------- * 1.00 Oct 31, 1994 -- Initial version. @@ -274,9 +268,18 @@ * commands across the various drivers and how * sense errors are handled. * + * 4.56 Sep 12, 1999 - Removed changer support - it is now in the + * Uniform layer. + * - Added partition based multisession handling. + * - Mode sense and mode select moved to the + * Uniform layer. + * - Fixed a problem with WPI CDS-32X drive - it + * failed the capabilities + * + * *************************************************************************/ -#define IDECD_VERSION "4.55" +#define IDECD_VERSION "4.56" #include #include @@ -548,6 +551,7 @@ { struct request *rq = HWGROUP(drive)->rq; int stat, cmd, err, sense_key; + struct packet_command *pc = (struct packet_command *) rq->buffer; /* Check for errors. */ stat = GET_STAT(); @@ -571,8 +575,6 @@ from the drive (probably while trying to recover from a former error). Just give up. */ - struct packet_command *pc = (struct packet_command *) - rq->buffer; pc->stat = 1; cdrom_end_request (1, drive); ide_error (drive, "request sense failure", stat); @@ -581,23 +583,11 @@ } else if (cmd == PACKET_COMMAND) { /* All other functions, except for READ. */ - struct packet_command *pc = (struct packet_command *) - rq->buffer; struct semaphore *sem = NULL; /* Check for tray open. */ if (sense_key == NOT_READY) { cdrom_saw_media_change (drive); -#if 0 /* let the upper layers do the complaining */ - /* Print an error message to the syslog. - Exception: don't print anything if this - is a read subchannel command. This is - because workman constantly polls the drive - with this command, and we don't want - to uselessly fill up the syslog. */ - if (pc->c[0] != GPCMD_READ_SUBCHANNEL) - printk ("%s: tray open or drive not ready\n", drive->name); -#endif } else if (sense_key == UNIT_ATTENTION) { /* Check for media change. */ cdrom_saw_media_change (drive); @@ -709,7 +699,7 @@ (void) (HWIF(drive)->dmaproc(ide_dma_begin, drive)); if (CDROM_CONFIG_FLAGS (drive)->drq_interrupt) { - ide_set_handler (drive, handler, WAIT_CMD); + ide_set_handler (drive, handler); OUT_BYTE (WIN_PACKETCMD, IDE_COMMAND_REG); /* packet command */ } else { OUT_BYTE (WIN_PACKETCMD, IDE_COMMAND_REG); /* packet command */ @@ -726,9 +716,13 @@ HANDLER is the interrupt handler to call when the command completes or there's data ready. */ static int cdrom_transfer_packet_command (ide_drive_t *drive, - char *cmd_buf, int cmd_len, + unsigned char *cmd_buf, int cmd_len, ide_handler_t *handler) { + /* set timeout to an hour */ + if (cmd_buf[0] == GPCMD_BLANK || cmd_buf[0] == GPCMD_FORMAT_UNIT) + drive->timeout = 3600*HZ; + if (CDROM_CONFIG_FLAGS (drive)->drq_interrupt) { /* Here we should have been called after receiving an interrupt from the device. DRQ should how be set. */ @@ -744,7 +738,7 @@ } /* Arm the interrupt handler. */ - ide_set_handler (drive, handler, WAIT_CMD); + ide_set_handler (drive, handler); /* Send the command to the device. */ atapi_output_bytes (drive, cmd_buf, cmd_len); @@ -837,6 +831,12 @@ atapi_output_bytes (drive, &dum, sizeof (dum)); len -= sizeof (dum); } + } else if (ireason == 1) { + /* Some drives (ASUS) seem to tell us that status + * info is available. just get it and ignore. + */ + GET_STAT(); + return 0; } else { /* Drive wants a command packet, or invalid ireason... */ printk ("%s: cdrom_read_intr: bad interrupt reason %d\n", @@ -847,7 +847,6 @@ return -1; } - /* * Interrupt routine. Called when a read request has completed. */ @@ -976,7 +975,7 @@ /* Done moving data! Wait for another interrupt. */ - ide_set_handler (drive, &cdrom_read_intr, WAIT_CMD); + ide_set_handler (drive, &cdrom_read_intr); } @@ -1036,8 +1035,6 @@ return 0; } - - /* * Routine to send a read packet command to the drive. * This is usually called directly from cdrom_start_read. @@ -1094,7 +1091,7 @@ pc.c[0] = GPCMD_READ_10; pc.c[7] = (nframes >> 8); pc.c[8] = (nframes & 0xff); - put_unaligned(htonl (frame), (unsigned int *) &pc.c[2]); + put_unaligned(cpu_to_be32(frame), (unsigned int *) &pc.c[2]); /* Send the command to the drive and return. */ (void) cdrom_transfer_packet_command (drive, pc.c, sizeof (pc.c), @@ -1137,7 +1134,7 @@ memset (&pc.c, 0, sizeof (pc.c)); pc.c[0] = GPCMD_SEEK; - put_unaligned(htonl (frame), (unsigned int *) &pc.c[2]); + put_unaligned(cpu_to_be32(frame), (unsigned int *) &pc.c[2]); (void) cdrom_transfer_packet_command (drive, pc.c, sizeof (pc.c), &cdrom_seek_intr); } @@ -1189,8 +1186,6 @@ } - - /**************************************************************************** * Execute all other packet commands. */ @@ -1207,6 +1202,9 @@ struct request *rq = HWGROUP(drive)->rq; struct packet_command *pc = (struct packet_command *)rq->buffer; + /* restore timeout after blank or format command */ + drive->timeout = WAIT_CMD; + /* Check for errors. */ if (cdrom_decode_status (drive, 0, &stat)) return; @@ -1292,7 +1290,7 @@ } /* Now we wait for another interrupt. */ - ide_set_handler (drive, &cdrom_pc_intr, WAIT_CMD); + ide_set_handler (drive, &cdrom_pc_intr); } @@ -1379,15 +1377,14 @@ /* End of retry loop. */ } while (pc->stat != 0 && retries >= 0); - /* Return an error if the command failed. */ if (pc->stat != 0) return -EIO; else { /* The command succeeded. If it was anything other than a request sense, eject, or door lock command, - and we think that the door is presently, lock it again. - (The door was probably unlocked via an explicit + and we think that the door is presently unlocked, lock it + again. (The door was probably unlocked via an explicit CDROMEJECT ioctl.) */ if (CDROM_STATE_FLAGS (drive)->door_locked == 0 && (pc->c[0] != GPCMD_TEST_UNIT_READY && @@ -1408,16 +1405,8 @@ static void ide_do_rw_cdrom (ide_drive_t *drive, struct request *rq, unsigned long block) { - if (rq -> cmd == PACKET_COMMAND || rq -> cmd == REQUEST_SENSE_COMMAND) - cdrom_do_packet_command (drive); - else if (rq -> cmd == RESET_DRIVE_COMMAND) { - cdrom_end_request (1, drive); - ide_do_reset (drive); - return; - } else if (rq -> cmd != READ) { - printk ("ide-cd: bad cmd %d\n", rq -> cmd); - cdrom_end_request (0, drive); - } else { + switch (rq->cmd) { + case READ: { struct cdrom_info *info = drive->driver_data; if (CDROM_CONFIG_FLAGS(drive)->seeking) { @@ -1426,7 +1415,7 @@ if ((stat & SEEK_STAT) != SEEK_STAT) { if (elpased < IDECD_SEEK_TIMEOUT) { - ide_stall_queue (drive, IDECD_SEEK_TIMER); + ide_stall_queue(drive, IDECD_SEEK_TIMER); return; } printk ("%s: DSC timeout\n", drive->name); @@ -1438,6 +1427,26 @@ else cdrom_start_read (drive, block); info->last_block = block; + break; + } + + case PACKET_COMMAND: + case REQUEST_SENSE_COMMAND: { + cdrom_do_packet_command(drive); + break; + } + + case RESET_DRIVE_COMMAND: { + cdrom_end_request(1, drive); + ide_do_reset(drive); + break; + } + + default: { + printk("ide-cd: bad cmd %d\n", rq -> cmd); + cdrom_end_request(0, drive); + break; + } } } @@ -1502,6 +1511,8 @@ struct atapi_request_sense *reqbuf) { struct packet_command pc; + struct cdrom_info *info = drive->driver_data; + struct cdrom_device_info *cdi = &info->devinfo; memset (&pc, 0, sizeof (pc)); @@ -1512,7 +1523,7 @@ /* the Sanyo 3 CD changer uses byte 7 of TEST_UNIT_READY to switch CDs instead of supporting the LOAD_UNLOAD opcode */ - pc.c[7] = CDROM_STATE_FLAGS (drive)->sanyo_slot % 3; + pc.c[7] = cdi->sanyo_slot % 3; #endif /* not STANDARD_ATAPI */ return cdrom_queue_packet_command (drive, &pc); @@ -1609,7 +1620,7 @@ stat = cdrom_queue_packet_command (drive, &pc); if (stat == 0) - *capacity = ntohl (capbuf.lba); + *capacity = be32_to_cpu(capbuf.lba); return stat; } @@ -1639,12 +1650,12 @@ /* Try to read the entire TOC for the disk into our internal buffer. */ static int -cdrom_read_toc (ide_drive_t *drive, - struct atapi_request_sense *reqbuf) +cdrom_read_toc (ide_drive_t *drive, struct atapi_request_sense *reqbuf) { int stat, ntracks, i; struct cdrom_info *info = drive->driver_data; struct atapi_toc *toc = info->toc; + int minor = drive->select.b.unit << PARTN_BITS; struct { struct atapi_toc_header hdr; struct atapi_toc_entry ent; @@ -1685,10 +1696,9 @@ if (ntracks > MAX_TRACKS) ntracks = MAX_TRACKS; /* Now read the whole schmeer. */ - stat = cdrom_read_tocentry (drive, toc->hdr.first_track-1, 1, 0, - (char *)&toc->hdr, + stat = cdrom_read_tocentry (drive, toc->hdr.first_track, 1, 0, (char *)&toc->hdr, sizeof (struct atapi_toc_header) + - (ntracks+1) * + (ntracks + 1) * sizeof (struct atapi_toc_entry), reqbuf); if (stat && toc->hdr.first_track > 1) { @@ -1724,6 +1734,7 @@ } else if (stat) { return stat; } + if (stat) return stat; toc->hdr.toc_length = ntohs (toc->hdr.toc_length); @@ -1750,7 +1761,7 @@ /* Read the multisession information. */ if (toc->hdr.first_track != CDROM_LEADOUT) { /* Read the multisession information. */ - stat = cdrom_read_tocentry (drive, toc->hdr.first_track-1, 1, 1, + stat = cdrom_read_tocentry (drive, 0, 1, 1, (char *)&ms_tmp, sizeof (ms_tmp), reqbuf); if (stat) return stat; @@ -1774,21 +1785,38 @@ /* Now try to get the total cdrom capacity. */ #if 0 - stat = cdrom_get_last_written(MKDEV(HWIF(drive)->major, - drive->select.b.unit << PARTN_BITS), + stat = cdrom_get_last_written(MKDEV(HWIF(drive)->major, minor, (long *)&toc->capacity); if (stat) #endif stat = cdrom_read_capacity (drive, &toc->capacity, reqbuf); if (stat) toc->capacity = 0x1fffff; - HWIF(drive)->gd->sizes[drive->select.b.unit << PARTN_BITS] - = (toc->capacity * SECTORS_PER_FRAME) >> (BLOCK_SIZE_BITS - 9); - drive->part[0].nr_sects = toc->capacity * SECTORS_PER_FRAME; + /* for general /dev/cdrom like mounting, one big disc */ + HWIF(drive)->gd->sizes[minor] = (toc->capacity * SECTORS_PER_FRAME) >> + (BLOCK_SIZE_BITS - 9); /* Remember that we've read this stuff. */ CDROM_STATE_FLAGS (drive)->toc_valid = 1; + /* should be "if multisession", but it does no harm. */ + if (ntracks == 1) + return 0; + + /* setup each minor to respond to a session */ + minor++; + i = toc->hdr.first_track; + while ((i <= ntracks) && ((minor & CD_PART_MASK) < CD_PART_MAX)) { + drive->part[minor & PARTN_MASK].start_sect = 0; + drive->part[minor & PARTN_MASK].nr_sects = (toc->ent[i].addr.lba * + SECTORS_PER_FRAME) << (BLOCK_SIZE_BITS - 9); + HWIF(drive)->gd->sizes[minor] = (toc->ent[i].addr.lba * + SECTORS_PER_FRAME) >> (BLOCK_SIZE_BITS - 9); + blksize_size[HWIF(drive)->major][minor] = CD_FRAMESIZE; + i++; + minor++; + } + return 0; } @@ -1814,46 +1842,6 @@ return cdrom_queue_packet_command (drive, &pc); } - -/* modeflag: 0 = current, 1 = changeable mask, 2 = default, 3 = saved */ -static int -cdrom_mode_sense (ide_drive_t *drive, int pageno, int modeflag, - char *buf, int buflen, - struct atapi_request_sense *reqbuf) -{ - struct packet_command pc; - - memset (&pc, 0, sizeof (pc)); - pc.sense_data = reqbuf; - - pc.buffer = buf; - pc.buflen = buflen; - pc.c[0] = GPCMD_MODE_SENSE_10; - pc.c[2] = pageno | (modeflag << 6); - pc.c[7] = (buflen >> 8); - pc.c[8] = (buflen & 0xff); - return cdrom_queue_packet_command (drive, &pc); -} - -static int -cdrom_mode_select (ide_drive_t *drive, int pageno, char *buf, int buflen, - struct atapi_request_sense *reqbuf) -{ - struct packet_command pc; - - memset (&pc, 0, sizeof (pc)); - pc.sense_data = reqbuf; - - pc.buffer = buf; - pc.buflen = buflen; - pc.c[0] = GPCMD_MODE_SELECT_10; - pc.c[1] = 0x10; - pc.c[2] = pageno; - pc.c[7] = (buflen >> 8); - pc.c[8] = (buflen & 0xff); - return cdrom_queue_packet_command (drive, &pc); -} - /* ATAPI cdrom drives are free to select the speed you request or any slower rate :-( Requesting too fast a speed will _not_ produce an error. */ static int @@ -1910,107 +1898,8 @@ } -/* If SLOT<0, unload the current slot. Otherwise, try to load SLOT. */ -static int -cdrom_load_unload (ide_drive_t *drive, int slot, - struct atapi_request_sense *reqbuf) -{ -#if ! STANDARD_ATAPI - /* if the drive is a Sanyo 3 CD changer then TEST_UNIT_READY - (used in the cdrom_check_status function) is used to - switch CDs instead of LOAD_UNLOAD */ - - if (CDROM_STATE_FLAGS (drive)->sanyo_slot > 0) { - - if ((slot == 1) || (slot == 2)) - CDROM_STATE_FLAGS (drive)->sanyo_slot = slot; - else if (slot >= 0) - CDROM_STATE_FLAGS (drive)->sanyo_slot = 3; - else - return 0; - - return cdrom_check_status (drive, reqbuf); - - } - else -#endif /*not STANDARD_ATAPI */ - { - - /* ATAPI Rev. 2.2+ standard for requesting switching of - CDs in a multiplatter device */ - - struct packet_command pc; - - memset (&pc, 0, sizeof (pc)); - pc.sense_data = reqbuf; - - pc.c[0] = GPCMD_LOAD_UNLOAD; - pc.c[4] = 2 + (slot >= 0); - pc.c[8] = slot; - return cdrom_queue_packet_command (drive, &pc); - - } -} - - -/* This gets the mechanism status per ATAPI draft spec 2.6 */ -static int -cdrom_read_mech_status (ide_drive_t *drive, char *buf, int buflen, - struct atapi_request_sense *reqbuf) -{ - struct packet_command pc; - - memset (&pc, 0, sizeof (pc)); - pc.sense_data = reqbuf; - - pc.buffer = buf; - pc.buflen = buflen; - pc.c[0] = GPCMD_MECHANISM_STATUS; - pc.c[8] = (buflen >> 8); - pc.c[9] = (buflen & 0xff); - return cdrom_queue_packet_command (drive, &pc); -} - -/* Read the drive mechanism status and slot table into our internal buffer. - If the buffer does not yet exist, allocate it. */ -static int -cdrom_read_changer_info (ide_drive_t *drive) -{ - int nslots; - struct cdrom_info *info = drive->driver_data; - - if (info->changer_info) - nslots = info->changer_info->hdr.nslots; - - else { - struct atapi_mechstat_header mechbuf; - int stat; - stat = cdrom_read_mech_status (drive, - (char *)&mechbuf, - sizeof (mechbuf), - NULL); - if (stat) - return stat; - nslots = mechbuf.nslots; - info->changer_info = - (struct atapi_changer_info *) - kmalloc (sizeof (struct atapi_changer_info) + - nslots * sizeof (struct atapi_slot), - GFP_KERNEL); - - if (info->changer_info == NULL) - return -ENOMEM; - } - - return cdrom_read_mech_status - (drive, - (char *)&info->changer_info->hdr, - sizeof (struct atapi_mechstat_header) + - nslots * sizeof (struct atapi_slot), - NULL); -} /* the generic packet interface to cdrom.c */ static int ide_cdrom_packet(struct cdrom_device_info *cdi, @@ -2026,44 +1915,40 @@ memcpy(pc.c, cgc->cmd, CDROM_PACKET_SIZE); pc.buffer = cgc->buffer; pc.buflen = cgc->buflen; - cgc->stat = cdrom_queue_packet_command(drive, &pc); - return cgc->stat; + return cgc->stat = cdrom_queue_packet_command(drive, &pc); } static int ide_cdrom_dev_ioctl (struct cdrom_device_info *cdi, unsigned int cmd, unsigned long arg) - { - ide_drive_t *drive = (ide_drive_t*) cdi->handle; + struct cdrom_generic_command cgc; + char buffer[16]; + int stat; + + init_cdrom_command(&cgc, buffer, sizeof(buffer)); + /* These will be moved into the Uniform layer shortly... */ switch (cmd) { case CDROMSETSPINDOWN: { char spindown; - char buffer[16]; - int stat; if (copy_from_user(&spindown, (void *) arg, sizeof(char))) return -EFAULT; - stat = cdrom_mode_sense (drive, GPMODE_CDROM_PAGE, 0, buffer, - sizeof (buffer), NULL); - if (stat) return stat; + if ((stat = cdrom_mode_sense(cdi, &cgc, GPMODE_CDROM_PAGE, 0))) + return stat; buffer[11] = (buffer[11] & 0xf0) | (spindown & 0x0f); - return cdrom_mode_select (drive, GPMODE_CDROM_PAGE, buffer, - sizeof (buffer), NULL); + return cdrom_mode_select(cdi, &cgc); } case CDROMGETSPINDOWN: { char spindown; - char buffer[16]; - int stat; - stat = cdrom_mode_sense (drive, GPMODE_CDROM_PAGE, 0, buffer, - sizeof (buffer), NULL); - if (stat) return stat; + if ((stat = cdrom_mode_sense(cdi, &cgc, GPMODE_CDROM_PAGE, 0))) + return stat; spindown = buffer[11] & 0x0f; @@ -2168,22 +2053,23 @@ int ide_cdrom_select_speed (struct cdrom_device_info *cdi, int speed) { int stat, attempts = 3; - struct { - char pad[8]; - struct atapi_capabilities_page cap; - } buf; ide_drive_t *drive = (ide_drive_t*) cdi->handle; struct atapi_request_sense reqbuf; + struct cdrom_generic_command cgc; + struct { + char pad[8]; + struct atapi_capabilities_page cap; + } buf; stat=cdrom_select_speed (drive, speed, &reqbuf); if (stat<0) return stat; + init_cdrom_command(&cgc, &buf, sizeof(buf)); /* Now with that done, update the speed fields */ do { /* we seem to get stat=0x01,err=0x00 the first time (??) */ if (attempts-- <= 0) return 0; - stat = cdrom_mode_sense (drive, GPMODE_CAPABILITIES_PAGE, 0, - (char *)&buf, sizeof (buf), NULL); + stat = cdrom_mode_sense(cdi, &cgc, GPMODE_CAPABILITIES_PAGE, 0); } while (stat); /* The ACER/AOpen 24X cdrom has the speed fields byte-swapped */ @@ -2202,92 +2088,10 @@ return 0; } - -static -int ide_cdrom_select_disc (struct cdrom_device_info *cdi, int slot) -{ - ide_drive_t *drive = (ide_drive_t*) cdi->handle; - struct cdrom_info *info = drive->driver_data; - - struct atapi_request_sense my_reqbuf; - int stat; - int nslots, curslot; - - if ( ! CDROM_CONFIG_FLAGS (drive)->is_changer) - return -EDRIVE_CANT_DO_THIS; - -#if ! STANDARD_ATAPI - if (CDROM_STATE_FLAGS (drive)->sanyo_slot > 0) { - nslots = 3; - curslot = CDROM_STATE_FLAGS (drive)->sanyo_slot; - if (curslot == 3) - curslot = 0; - } else -#endif /* not STANDARD_ATAPI */ - { - stat = cdrom_read_changer_info (drive); - if (stat) - return stat; - - nslots = info->changer_info->hdr.nslots; - curslot = info->changer_info->hdr.curslot; - } - - if (slot == curslot) - return curslot; - - if (slot == CDSL_CURRENT) - return curslot; - - if (slot != CDSL_NONE && (slot < 0 || slot >= nslots)) - return -EINVAL; - - if (drive->usage > 1) - return -EBUSY; - - if (slot == CDSL_NONE) { - (void) cdrom_load_unload (drive, -1, NULL); - cdrom_saw_media_change (drive); - (void) cdrom_lockdoor (drive, 0, NULL); - return 0; - } - else { - int was_locked; - - if ( -#if ! STANDARD_ATAPI - CDROM_STATE_FLAGS (drive)->sanyo_slot == 0 && -#endif - info->changer_info->slots[slot].disc_present == 0) { - return -ENOMEDIUM; - } - - was_locked = CDROM_STATE_FLAGS (drive)->door_locked; - if (was_locked) - (void) cdrom_lockdoor (drive, 0, NULL); - - stat = cdrom_load_unload (drive, slot, NULL); - cdrom_saw_media_change (drive); - if (stat) - return stat; - - stat = cdrom_check_status (drive, &my_reqbuf); - if (stat && my_reqbuf.sense_key == NOT_READY) - return -ENOENT; - - if (was_locked) - (void) cdrom_lockdoor (drive, 1, NULL); - - return slot; - } -} - - static int ide_cdrom_drive_status (struct cdrom_device_info *cdi, int slot_nr) { ide_drive_t *drive = (ide_drive_t*) cdi->handle; - struct cdrom_info *info = drive->driver_data; if (slot_nr == CDSL_CURRENT) { @@ -2304,24 +2108,8 @@ } return CDS_DRIVE_NOT_READY; - } - -#if ! STANDARD_ATAPI - else if (CDROM_STATE_FLAGS (drive)->sanyo_slot > 0) - return CDS_NO_INFO; -#endif /* not STANDARD_ATAPI */ - - else { - struct atapi_changer_info *ci; - int stat = cdrom_read_changer_info (drive); - if (stat < 0) - return stat; - ci = info->changer_info; - - if (ci->slots[slot_nr].disc_present) - return CDS_DISC_OK; - else - return CDS_NO_DISC; + } else { + return -EINVAL; } } @@ -2372,47 +2160,14 @@ int slot_nr) { ide_drive_t *drive = (ide_drive_t*) cdi->handle; - struct cdrom_info *info = drive->driver_data; - struct atapi_request_sense reqbuf; - int retval; if (slot_nr == CDSL_CURRENT) { (void) cdrom_check_status (drive, NULL); - retval = CDROM_STATE_FLAGS (drive)->media_changed; CDROM_STATE_FLAGS (drive)->media_changed = 0; + return CDROM_STATE_FLAGS (drive)->media_changed; + } else { + return -EINVAL; } - -#if ! STANDARD_ATAPI - else if (CDROM_STATE_FLAGS (drive)->sanyo_slot > 0) { - retval = 0; - } -#endif /* not STANDARD_ATAPI */ - - else { - struct atapi_changer_info *ci; - int stat = cdrom_read_changer_info (drive); - if (stat < 0) - return stat; - ci = info->changer_info; - - /* This test may be redundant with cdrom.c. */ - if (slot_nr < 0 || slot_nr >= ci->hdr.nslots) - return -EINVAL; - - retval = ci->slots[slot_nr].change; - } - - /* if the media has changed, check if a disc is in the drive - and read the toc info. */ - if (retval || !CDROM_STATE_FLAGS (drive)->toc_valid) { - /* if cdrom_read_toc fails, return 1 to indicate - that a disc change has occured. there might not - be a disc in the drive. */ - if ((retval = cdrom_read_toc (drive, &reqbuf))) - return 1; - } - - return retval; } @@ -2447,7 +2202,7 @@ ide_cdrom_tray_move, /* tray_move */ ide_cdrom_lock_door, /* lock_door */ ide_cdrom_select_speed, /* select_speed */ - ide_cdrom_select_disc, /* select_disc */ + NULL, /* select_disc */ ide_cdrom_get_last_session, /* get_last_session */ ide_cdrom_get_mcn, /* get_mcn */ ide_cdrom_reset, /* reset */ @@ -2468,7 +2223,7 @@ struct cdrom_device_info *devinfo = &info->devinfo; int minor = (drive->select.b.unit)<dev = MKDEV (HWIF(drive)->major, minor); + devinfo->dev = MKDEV (HWIF(drive)->major, minor | CD_PART_MASK); devinfo->ops = &ide_cdrom_dops; devinfo->mask = 0; *(int *)&devinfo->speed = CDROM_STATE_FLAGS (drive)->current_speed; @@ -2501,8 +2256,11 @@ static int ide_cdrom_probe_capabilities (ide_drive_t *drive) { + struct cdrom_info *info = drive->driver_data; + struct cdrom_device_info *cdi = &info->devinfo; int stat, nslots = 1, attempts = 3; - struct { + struct cdrom_generic_command cgc; + struct { char pad[8]; struct atapi_capabilities_page cap; } buf; @@ -2510,11 +2268,20 @@ if (CDROM_CONFIG_FLAGS (drive)->nec260) return nslots; - do { /* we seem to get stat=0x01,err=0x00 the first time (??) */ + init_cdrom_command(&cgc, &buf, sizeof(buf)); + /* we have to cheat a little here. the packet will eventually + * be queued with ide_cdrom_packet(), which extracts the + * drive from cdi->handle. Since this device hasn't been + * registered with the Uniform layer yet, it can't do this. + * Same goes for cdi->ops. + */ + cdi->handle = (ide_drive_t *) drive; + cdi->ops = &ide_cdrom_dops; + /* we seem to get stat=0x01,err=0x00 the first time (??) */ + do { if (attempts-- <= 0) return 0; - stat = cdrom_mode_sense (drive, GPMODE_CAPABILITIES_PAGE, 0, - (char *)&buf, sizeof (buf), NULL); + stat = cdrom_mode_sense(cdi, &cgc, GPMODE_CAPABILITIES_PAGE, 0); } while (stat); if (buf.cap.lock == 0) @@ -2539,7 +2306,7 @@ CDROM_CONFIG_FLAGS (drive)->close_tray = 0; #if ! STANDARD_ATAPI - if (CDROM_STATE_FLAGS (drive)->sanyo_slot > 0) { + if (cdi->sanyo_slot > 0) { CDROM_CONFIG_FLAGS (drive)->is_changer = 1; nslots = 3; } @@ -2548,14 +2315,9 @@ #endif /* not STANDARD_ATAPI */ if (buf.cap.mechtype == mechtype_individual_changer || buf.cap.mechtype == mechtype_cartridge_changer) { - struct atapi_mechstat_header mechbuf; - - stat = cdrom_read_mech_status (drive, (char*)&mechbuf, - sizeof (mechbuf), NULL); - if (!stat) { + if ((nslots = cdrom_number_of_slots(cdi)) > 1) { CDROM_CONFIG_FLAGS (drive)->is_changer = 1; CDROM_CONFIG_FLAGS (drive)->supp_disc_present = 1; - nslots = mechbuf.nslots; } } @@ -2591,7 +2353,7 @@ else printk (" drive"); - printk (", %dkB Cache", ntohs(buf.cap.buffer_size)); + printk (", %dkB Cache", be16_to_cpu(buf.cap.buffer_size)); if (drive->using_dma) { if ((drive->id->field_valid & 4) && @@ -2619,69 +2381,21 @@ ide_add_setting(drive, "dsc_overlap", SETTING_RW, -1, -1, TYPE_BYTE, 0, 1, 1, 1, &drive->dsc_overlap, NULL); } -#ifdef CONFIG_IDECD_SLOTS -static void ide_cdrom_slot_check (ide_drive_t *drive, int nslots) -{ - tracktype tracks; - struct cdrom_info *info = drive->driver_data; - struct cdrom_device_info *devinfo = &info->devinfo; - int slot_count = 0, drive_stat = 0, tmp; - - for (slot_count=0;slot_countdriver_data; + struct cdrom_device_info *cdi = &info->devinfo; + int minor = drive->select.b.unit << PARTN_BITS; int nslots; - kdev_t dev = MKDEV (HWIF (drive)->major, - drive->select.b.unit << PARTN_BITS); + set_device_ro(MKDEV(HWIF(drive)->major, minor), 1); + blksize_size[HWIF(drive)->major][minor] = CD_FRAMESIZE; - set_device_ro (dev, 1); - blksize_size[HWIF(drive)->major][drive->select.b.unit << PARTN_BITS] = - CD_FRAMESIZE; - - drive->special.all = 0; - drive->ready_stat = 0; + drive->special.all = 0; + drive->ready_stat = 0; + drive->timeout = WAIT_CMD; CDROM_STATE_FLAGS (drive)->media_changed = 1; CDROM_STATE_FLAGS (drive)->toc_valid = 0; @@ -2723,7 +2437,7 @@ #if ! STANDARD_ATAPI /* by default Sanyo 3 CD changer support is turned off and ATAPI Rev 2.2+ standard support for CD changers is used */ - CDROM_STATE_FLAGS (drive)->sanyo_slot = 0; + cdi->sanyo_slot = 0; CDROM_CONFIG_FLAGS (drive)->nec260 = 0; CDROM_CONFIG_FLAGS (drive)->toctracks_as_bcd = 0; @@ -2775,7 +2489,7 @@ (strcmp(drive->id->model, "CD-ROM CDR-C3G") == 0) || (strcmp(drive->id->model, "CD-ROM CDR_C36") == 0)) { /* uses CD in slot 0 when value is set to 3 */ - CDROM_STATE_FLAGS (drive)->sanyo_slot = 3; + cdi->sanyo_slot = 3; } @@ -2787,6 +2501,8 @@ info->sector_buffered = 0; info->nsectors_buffered = 0; info->changer_info = NULL; + info->last_block = 0; + info->start_seek = 0; nslots = ide_cdrom_probe_capabilities (drive); @@ -2796,11 +2512,6 @@ return 1; } ide_cdrom_add_settings(drive); -#ifdef CONFIG_IDECD_SLOTS - if (CDROM_CONFIG_FLAGS (drive)->is_changer) { - ide_cdrom_slot_check(drive, nslots); - } -#endif /* CONFIG_IDECD_SLOTS */ return 0; } @@ -2852,14 +2563,14 @@ if (ide_unregister_subdriver (drive)) return 1; if (info->sector_buffer != NULL) - kfree (info->sector_buffer); + kfree(info->sector_buffer); if (info->toc != NULL) - kfree (info->toc); + kfree(info->toc); if (info->changer_info != NULL) - kfree (info->changer_info); + kfree(info->changer_info); if (devinfo->handle == drive && unregister_cdrom (devinfo)) printk ("%s: ide_cdrom_cleanup failed to unregister device from the cdrom driver.\n", drive->name); - kfree (info); + kfree(info); drive->driver_data = NULL; return 0; } @@ -2927,11 +2638,12 @@ MOD_INC_USE_COUNT; while ((drive = ide_scan_devices (ide_cdrom, ide_cdrom_driver.name, NULL, failed++)) != NULL) { /* skip drives that we were told to ignore */ - if (ignore != NULL) + if (ignore != NULL) { if (strstr(ignore, drive->name)) { printk("ide-cd: ignoring drive %s\n", drive->name); continue; } + } info = (struct cdrom_info *) kmalloc (sizeof (struct cdrom_info), GFP_KERNEL); if (info == NULL) { printk ("%s: Can't allocate a cdrom structure\n", drive->name); diff -ur --exclude-from /home/axboe/cdrom/exclude-from /tmp/linux-2.3.18/drivers/block/ide-cd.h linux/drivers/block/ide-cd.h --- /tmp/linux-2.3.18/drivers/block/ide-cd.h Sun Sep 26 21:14:31 1999 +++ linux/drivers/block/ide-cd.h Sat Sep 25 15:14:27 1999 @@ -96,8 +96,8 @@ __u8 media_changed : 1; /* Driver has noticed a media change. */ __u8 toc_valid : 1; /* Saved TOC information is current. */ __u8 door_locked : 1; /* We think that the drive door is locked. */ - __u8 sanyo_slot : 2; /* Sanyo 3 CD changer support */ - __u8 reserved : 3; + __u8 writing : 1; /* the drive is currently writing */ + __u8 reserved : 4; byte current_speed; /* Current speed of the drive */ }; #define CDROM_STATE_FLAGS(drive) (&(((struct cdrom_info *)(drive->driver_data))->state_flags)) @@ -218,14 +218,6 @@ } acdsc_reladdr; }; - -typedef enum { - mechtype_caddy = 0, - mechtype_tray = 1, - mechtype_popup = 2, - mechtype_individual_changer = 4, - mechtype_cartridge_changer = 5 -} mechtype_t; /* This should probably go into cdrom.h along with the other diff -ur --exclude-from /home/axboe/cdrom/exclude-from /tmp/linux-2.3.18/drivers/block/ide-disk.c linux/drivers/block/ide-disk.c --- /tmp/linux-2.3.18/drivers/block/ide-disk.c Sun Sep 26 21:14:31 1999 +++ linux/drivers/block/ide-disk.c Sun Sep 26 21:14:04 1999 @@ -177,7 +177,7 @@ if (i > 0) { if (msect) goto read_next; - ide_set_handler (drive, &read_intr, WAIT_CMD); + ide_set_handler (drive, &read_intr); } } @@ -208,7 +208,7 @@ ide_end_request(1, hwgroup); if (i > 0) { idedisk_output_data (drive, rq->buffer, SECTOR_WORDS); - ide_set_handler (drive, &write_intr, WAIT_CMD); + ide_set_handler (drive, &write_intr); } goto out; } @@ -273,7 +273,7 @@ if (stat & DRQ_STAT) { if (rq->nr_sectors) { ide_multwrite(drive, drive->mult_count); - ide_set_handler (drive, &multwrite_intr, WAIT_CMD); + ide_set_handler (drive, &multwrite_intr); goto out; } } else { @@ -387,7 +387,7 @@ if (drive->using_dma && !(HWIF(drive)->dmaproc(ide_dma_read, drive))) return; #endif /* CONFIG_BLK_DEV_IDEDMA */ - ide_set_handler(drive, &read_intr, WAIT_CMD); + ide_set_handler(drive, &read_intr); OUT_BYTE(drive->mult_count ? WIN_MULTREAD : WIN_READ, IDE_COMMAND_REG); return; } @@ -406,10 +406,10 @@ __cli(); /* local CPU only */ if (drive->mult_count) { HWGROUP(drive)->wrq = *rq; /* scratchpad */ - ide_set_handler (drive, &multwrite_intr, WAIT_CMD); + ide_set_handler (drive, &multwrite_intr); ide_multwrite(drive, drive->mult_count); } else { - ide_set_handler (drive, &write_intr, WAIT_CMD); + ide_set_handler (drive, &write_intr); idedisk_output_data(drive, rq->buffer, SECTOR_WORDS); } return; @@ -504,6 +504,7 @@ drive->special.all = 0; drive->special.b.set_geometry = 1; drive->special.b.recalibrate = 1; + drive->timeout = WAIT_CMD; if (OK_TO_RESET_CONTROLLER) drive->mult_count = 0; if (!drive->keep_settings) diff -ur --exclude-from /home/axboe/cdrom/exclude-from /tmp/linux-2.3.18/drivers/block/ide-dma.c linux/drivers/block/ide-dma.c --- /tmp/linux-2.3.18/drivers/block/ide-dma.c Sun Sep 26 20:57:08 1999 +++ linux/drivers/block/ide-dma.c Sun Sep 26 19:38:05 1999 @@ -420,7 +420,8 @@ drive->waiting_for_dma = 1; if (drive->media != ide_disk) return 0; - ide_set_handler(drive, &ide_dma_intr, WAIT_CMD);/* issue cmd to drive */ + drive->timeout = WAIT_CMD; + ide_set_handler(drive, &ide_dma_intr);/* issue cmd to drive */ OUT_BYTE(reading ? WIN_READDMA : WIN_WRITEDMA, IDE_COMMAND_REG); case ide_dma_begin: /* Note that this is done *after* the cmd has diff -ur --exclude-from /home/axboe/cdrom/exclude-from /tmp/linux-2.3.18/drivers/block/ide-floppy.c linux/drivers/block/ide-floppy.c --- /tmp/linux-2.3.18/drivers/block/ide-floppy.c Sun Sep 26 21:14:31 1999 +++ linux/drivers/block/ide-floppy.c Sun Sep 26 21:14:04 1999 @@ -916,7 +916,7 @@ if (temp > pc->buffer_size) { printk (KERN_ERR "ide-floppy: The floppy wants to send us more data than expected - discarding data\n"); idefloppy_discard_data (drive,bcount.all); - ide_set_handler (drive,&idefloppy_pc_intr,IDEFLOPPY_WAIT_CMD); + ide_set_handler (drive,&idefloppy_pc_intr); return; } #if IDEFLOPPY_DEBUG_LOG @@ -938,7 +938,7 @@ pc->actually_transferred+=bcount.all; /* Update the current position */ pc->current_position+=bcount.all; - ide_set_handler (drive,&idefloppy_pc_intr,IDEFLOPPY_WAIT_CMD); /* And set the interrupt handler again */ + ide_set_handler (drive,&idefloppy_pc_intr); /* And set the interrupt handler again */ } static void idefloppy_transfer_pc (ide_drive_t *drive) @@ -956,7 +956,7 @@ ide_do_reset (drive); return; } - ide_set_handler (drive, &idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD); /* Set the interrupt routine */ + ide_set_handler (drive, &idefloppy_pc_intr); /* Set the interrupt routine */ atapi_output_bytes (drive, floppy->pc->c, 12); /* Send the actual packet */ } @@ -1025,7 +1025,7 @@ #endif /* CONFIG_BLK_DEV_IDEDMA */ if (test_bit (IDEFLOPPY_DRQ_INTERRUPT, &floppy->flags)) { - ide_set_handler (drive, &idefloppy_transfer_pc, IDEFLOPPY_WAIT_CMD); + ide_set_handler (drive, &idefloppy_transfer_pc); OUT_BYTE (WIN_PACKETCMD, IDE_COMMAND_REG); /* Issue the packet command */ } else { OUT_BYTE (WIN_PACKETCMD, IDE_COMMAND_REG); @@ -1519,6 +1519,7 @@ *((unsigned short *) &gcw) = drive->id->config; drive->driver_data = floppy; drive->ready_stat = 0; + drive->timeout = IDEFLOPPY_WAIT_CMD; memset (floppy, 0, sizeof (idefloppy_floppy_t)); floppy->drive = drive; floppy->pc = floppy->pc_stack; diff -ur --exclude-from /home/axboe/cdrom/exclude-from /tmp/linux-2.3.18/drivers/block/ide-tape.c linux/drivers/block/ide-tape.c --- /tmp/linux-2.3.18/drivers/block/ide-tape.c Sun Sep 26 21:14:31 1999 +++ linux/drivers/block/ide-tape.c Sun Sep 26 21:14:04 1999 @@ -1833,7 +1833,7 @@ if (temp > pc->buffer_size) { printk (KERN_ERR "ide-tape: The tape wants to send us more data than expected - discarding data\n"); idetape_discard_data (drive,bcount.all); - ide_set_handler (drive,&idetape_pc_intr,IDETAPE_WAIT_CMD); + ide_set_handler (drive,&idetape_pc_intr); return; } #if IDETAPE_DEBUG_LOG @@ -1855,7 +1855,7 @@ pc->actually_transferred+=bcount.all; /* Update the current position */ pc->current_position+=bcount.all; - ide_set_handler (drive,&idetape_pc_intr,IDETAPE_WAIT_CMD); /* And set the interrupt handler again */ + ide_set_handler (drive,&idetape_pc_intr); /* And set the interrupt handler again */ } /* @@ -1928,7 +1928,7 @@ ide_do_reset (drive); return; } - ide_set_handler(drive, &idetape_pc_intr, IDETAPE_WAIT_CMD); /* Set the interrupt routine */ + ide_set_handler(drive, &idetape_pc_intr); /* Set the interrupt routine */ atapi_output_bytes (drive,pc->c,12); /* Send the actual packet */ } @@ -1995,7 +1995,7 @@ } #endif /* CONFIG_BLK_DEV_IDEDMA */ if (test_bit(IDETAPE_DRQ_INTERRUPT, &tape->flags)) { - ide_set_handler(drive, &idetape_transfer_pc, IDETAPE_WAIT_CMD); + ide_set_handler(drive, &idetape_transfer_pc); OUT_BYTE(WIN_PACKETCMD, IDE_COMMAND_REG); } else { OUT_BYTE(WIN_PACKETCMD, IDE_COMMAND_REG); @@ -3579,6 +3579,7 @@ spin_lock_init(&tape->spinlock); drive->driver_data = tape; drive->ready_stat = 0; /* An ATAPI device ignores DRDY */ + drive->timeout = IDETAPE_WAIT_CMD; #ifdef CONFIG_BLK_DEV_IDEPCI /* * These two ide-pci host adapters appear to need this disabled. diff -ur --exclude-from /home/axboe/cdrom/exclude-from /tmp/linux-2.3.18/drivers/block/ide.c linux/drivers/block/ide.c --- /tmp/linux-2.3.18/drivers/block/ide.c Sun Sep 26 21:14:31 1999 +++ linux/drivers/block/ide.c Sun Sep 26 21:14:04 1999 @@ -504,7 +504,7 @@ * timer is started to prevent us from waiting forever in case * something goes wrong (see the ide_timer_expiry() handler later on). */ -void ide_set_handler (ide_drive_t *drive, ide_handler_t *handler, unsigned int timeout) +void ide_set_handler (ide_drive_t *drive, ide_handler_t *handler) { unsigned long flags; ide_hwgroup_t *hwgroup = HWGROUP(drive); @@ -517,7 +517,7 @@ } #endif hwgroup->handler = handler; - hwgroup->timer.expires = jiffies + timeout; + hwgroup->timer.expires = jiffies + drive->timeout; add_timer(&(hwgroup->timer)); spin_unlock_irqrestore(&hwgroup->spinlock, flags); } @@ -565,6 +565,7 @@ static void atapi_reset_pollfunc (ide_drive_t *drive) { ide_hwgroup_t *hwgroup = HWGROUP(drive); + unsigned long old_timeout; byte stat; SELECT_DRIVE(HWIF(drive),drive); @@ -574,7 +575,10 @@ printk("%s: ATAPI reset complete\n", drive->name); } else { if (0 < (signed long)(hwgroup->poll_timeout - jiffies)) { - ide_set_handler (drive, &atapi_reset_pollfunc, HZ/20); + old_timeout = drive->timeout; + drive->timeout = HZ / 20; + ide_set_handler (drive, &atapi_reset_pollfunc); + drive->timeout = old_timeout; return; /* continue polling */ } hwgroup->poll_timeout = 0; /* end of polling */ @@ -595,11 +599,15 @@ { ide_hwgroup_t *hwgroup = HWGROUP(drive); ide_hwif_t *hwif = HWIF(drive); + unsigned long old_timeout; byte tmp; if (!OK_STAT(tmp=GET_STAT(), 0, BUSY_STAT)) { if (0 < (signed long)(hwgroup->poll_timeout - jiffies)) { - ide_set_handler (drive, &reset_pollfunc, HZ/20); + old_timeout = drive->timeout; + drive->timeout = HZ / 20; + ide_set_handler (drive, &reset_pollfunc); + drive->timeout = old_timeout; return; /* continue polling */ } printk("%s: reset timed-out, status=0x%02x\n", hwif->name, tmp); @@ -667,6 +675,7 @@ unsigned long flags; ide_hwif_t *hwif = HWIF(drive); ide_hwgroup_t *hwgroup = HWGROUP(drive); + unsigned long old_timeout; __save_flags(flags); /* local CPU only */ __cli(); /* local CPU only */ @@ -678,7 +687,10 @@ udelay (20); OUT_BYTE (WIN_SRST, IDE_COMMAND_REG); hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE; - ide_set_handler (drive, &atapi_reset_pollfunc, HZ/20); + old_timeout = drive->timeout; + drive->timeout = HZ / 20; + ide_set_handler (drive, &atapi_reset_pollfunc); + drive->timeout = old_timeout; __restore_flags (flags); /* local CPU only */ return; } @@ -708,7 +720,10 @@ OUT_BYTE(drive->ctl|2,IDE_CONTROL_REG); /* clear SRST, leave nIEN */ udelay(10); /* more than enough time */ hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE; - ide_set_handler (drive, &reset_pollfunc, HZ/20); + old_timeout = drive->timeout; + drive->timeout = HZ / 20; + ide_set_handler (drive, &reset_pollfunc); + drive->timeout = old_timeout; #endif /* OK_TO_RESET_CONTROLLER */ __restore_flags (flags); /* local CPU only */ @@ -899,7 +914,7 @@ */ void ide_cmd(ide_drive_t *drive, byte cmd, byte nsect, ide_handler_t *handler) { - ide_set_handler (drive, handler, WAIT_CMD); + ide_set_handler (drive, handler); if (IDE_CONTROL_REG) OUT_BYTE(drive->ctl,IDE_CONTROL_REG); /* clear nIEN */ OUT_BYTE(nsect,IDE_NSECTOR_REG); @@ -1370,8 +1385,8 @@ } hwgroup->busy = 1; /* should already be "1" */ hwgroup->handler = NULL; - del_timer(&hwgroup->timer); /* Is this needed?? */ - if (hwgroup->poll_timeout != 0) { /* polling in progress? */ + /* polling in progress or just don't timeout */ + if (hwgroup->poll_timeout != 0) { spin_unlock_irqrestore(&hwgroup->spinlock, flags); handler(drive); } else if (drive_is_ready(drive)) { @@ -1609,11 +1624,8 @@ } spin_unlock_irqrestore(&io_request_lock, flags); do_hwgroup_request(hwgroup); - save_flags(flags); /* all CPUs; overkill? */ - cli(); /* all CPUs; overkill? */ if (action == ide_wait && rq->rq_status != RQ_INACTIVE) down(&sem); /* wait for it to be serviced */ - restore_flags(flags); /* all CPUs; overkill? */ return rq->errors ? -EIO : 0; /* return -EIO if errors */ } diff -ur --exclude-from /home/axboe/cdrom/exclude-from /tmp/linux-2.3.18/drivers/block/paride/pcd.c linux/drivers/block/paride/pcd.c --- /tmp/linux-2.3.18/drivers/block/paride/pcd.c Sun Sep 26 21:14:31 1999 +++ linux/drivers/block/paride/pcd.c Sun Sep 26 21:14:04 1999 @@ -214,8 +214,11 @@ static int pcd_get_mcn (struct cdrom_device_info *cdi, struct cdrom_mcn *mcn); static int pcd_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void *arg); +static int pcd_packet(struct cdrom_device_info *cdi, + struct cdrom_generic_command *cgc); static int pcd_detect(void); +static void pcd_probe_capabilities(void); static void do_pcd_read_drq(void); static void do_pcd_request(void); static void do_pcd_read(void); @@ -276,14 +279,18 @@ pcd_drive_reset, pcd_audio_ioctl, 0, /* dev_ioctl */ - CDC_CLOSE_TRAY | - CDC_OPEN_TRAY | - CDC_LOCK | - CDC_MCN | - CDC_MEDIA_CHANGED | - CDC_RESET | - CDC_PLAY_AUDIO, - 0 + CDC_CLOSE_TRAY | + CDC_OPEN_TRAY | + CDC_LOCK | + CDC_MCN | + CDC_MEDIA_CHANGED | + CDC_RESET | + CDC_PLAY_AUDIO | + CDC_GENERIC_PACKET | + CDC_CD_R | + CDC_CD_RW, + 0, + pcd_packet, }; static void pcd_init_units( void ) @@ -325,6 +332,9 @@ if (pcd_detect()) return -1; + /* get the atapi capabilities page */ + pcd_probe_capabilities(); + if (register_blkdev(MAJOR_NR,name,&cdrom_fops)) { printk("pcd: unable to get major number %d\n",MAJOR_NR); return -1; @@ -525,6 +535,16 @@ return r; } +static int pcd_packet(struct cdrom_device_info *cdi, + struct cdrom_generic_command *cgc) +{ + char *un_cmd; + int unit = DEVICE_NR(cdi->dev); + + un_cmd = cgc->cmd; + return pcd_atapi(unit,un_cmd,cgc->buflen,cgc->buffer, "generic packet"); +} + #define DBMSG(msg) ((verbose>1)?(msg):NULL) static int pcd_media_changed(struct cdrom_device_info *cdi, int slot_nr) @@ -667,6 +687,32 @@ return -1; } +static void pcd_probe_capabilities( void ) + +{ int unit, r; + char buffer[32]; + char cmd[12]={0x5a,1<<3,0x2a,0,0,0,0,18,0,0,0,0}; + + for (unit=0;unit> 6) == 0) + PCD.info.mask |= CDC_CLOSE_TRAY; + } +} + static int pcd_detect( void ) { char id[18]; @@ -836,63 +882,6 @@ switch (cmd) { - case CDROMPAUSE: - - { char cmd[12]={GPCMD_PAUSE_RESUME,0,0,0,0,0,0,0,0,0,0,0}; - - return (pcd_atapi(unit,cmd,0,NULL,"pause")) * EIO; - } - - case CDROMRESUME: - - { char cmd[12]={GPCMD_PAUSE_RESUME,0,0,0,0,0,0,0,1,0,0,0}; - - return (pcd_atapi(unit,cmd,0,NULL,"resume")) * EIO; - } - - case CDROMPLAYMSF: - - { char cmd[12]={GPCMD_PLAY_AUDIO_MSF,0,0,0,0,0,0,0,0,0,0,0}; - struct cdrom_msf* msf = (struct cdrom_msf*)arg; - - cmd[3] = msf->cdmsf_min0; - cmd[4] = msf->cdmsf_sec0; - cmd[5] = msf->cdmsf_frame0; - cmd[6] = msf->cdmsf_min1; - cmd[7] = msf->cdmsf_sec1; - cmd[8] = msf->cdmsf_frame1; - - return (pcd_atapi(unit,cmd,0,NULL,"play msf")) * EIO; - } - - case CDROMPLAYBLK: - - { char cmd[12]={GPCMD_PLAY_AUDIO_10,0,0,0,0,0,0,0,0,0,0,0}; - struct cdrom_blk* blk = (struct cdrom_blk*)arg; - - cmd[2] = blk->from >> 24; - cmd[3] = blk->from >> 16; - cmd[4] = blk->from >> 8; - cmd[5] = blk->from; - cmd[7] = blk->len >> 8; - cmd[8] = blk->len; - - return (pcd_atapi(unit,cmd,0,NULL,"play block")) * EIO; - } - - case CDROMPLAYTRKIND: - - { char cmd[12]={GPCMD_PLAYAUDIO_TI,0,0,0,0,0,0,0,0,0,0,0}; - struct cdrom_ti* ti = (struct cdrom_ti*)arg; - - cmd[4] = ti->cdti_trk0; - cmd[5] = ti->cdti_ind0; - cmd[7] = ti->cdti_trk1; - cmd[8] = ti->cdti_ind1; - - return (pcd_atapi(unit,cmd,0,NULL,"play track")) * EIO; - } - case CDROMREADTOCHDR: { char cmd[12]={GPCMD_READ_TOC_PMA_ATIP,0,0,0,0,0,0,0,12,0,0,0}; @@ -935,97 +924,6 @@ return r * EIO; } - - case CDROMSTOP: - - { char cmd[12]={GPCMD_START_STOP_UNIT,1,0,0,0,0,0,0,0,0,0,0}; - - return (pcd_atapi(unit,cmd,0,NULL,"stop")) * EIO; - } - - case CDROMSTART: - - { char cmd[12]={GPCMD_START_STOP_UNIT,1,0,0,1,0,0,0,0,0,0,0}; - - return (pcd_atapi(unit,cmd,0,NULL,"start")) * EIO; - } - - case CDROMVOLCTRL: - - { char cmd[12]={GPCMD_MODE_SENSE_10,0,0,0,0,0,0,0,0,0,0,0}; - char buffer[32]; - char mask[32]; - struct cdrom_volctrl* volctrl = (struct cdrom_volctrl*)arg; - - cmd[2] = 0xe; - cmd[4] = 28; - - if (pcd_atapi(unit,cmd,28,buffer,"mode sense vol")) - return -EIO; - - cmd[2] = 0x4e; - - if (pcd_atapi(unit,cmd,28,buffer,"mode sense vol mask")) - return -EIO; - - buffer[0] = 0; - - buffer[21] = volctrl->channel0 & mask[21]; - buffer[23] = volctrl->channel1 & mask[23]; - buffer[25] = volctrl->channel2 & mask[25]; - buffer[27] = volctrl->channel3 & mask[27]; - - cmd[0] = 0x55; - cmd[1] = 0x10; - - return pcd_atapi(unit,cmd,28,buffer,"mode select vol") * EIO; - } - - case CDROMVOLREAD: - - { char cmd[12]={GPCMD_MODE_SENSE_10,0,0,0,0,0,0,0,0,0,0,0}; - char buffer[32]; - struct cdrom_volctrl* volctrl = (struct cdrom_volctrl*)arg; - int r; - - cmd[2] = 0xe; - cmd[4] = 28; - - r = pcd_atapi(unit,cmd,28,buffer,"mode sense vol read"); - - volctrl->channel0 = buffer[21]; - volctrl->channel1 = buffer[23]; - volctrl->channel2 = buffer[25]; - volctrl->channel3 = buffer[27]; - - return r * EIO; - } - - - case CDROMSUBCHNL: - - { char cmd[12]={GPCMD_READ_SUBCHANNEL,2,0x40,1,0,0,0,0,16,0,0,0}; - struct cdrom_subchnl* subchnl = (struct cdrom_subchnl*)arg; - char buffer[32]; - - if (pcd_atapi(unit,cmd,16,buffer,"read subchannel")) - return -EIO; - - subchnl->cdsc_audiostatus = buffer[1]; - subchnl->cdsc_format = CDROM_MSF; - subchnl->cdsc_ctrl = buffer[5] & 0xf; - subchnl->cdsc_trk = buffer[6]; - subchnl->cdsc_ind = buffer[7]; - - subchnl->cdsc_reladdr.msf.minute = buffer[13]; - subchnl->cdsc_reladdr.msf.second = buffer[14]; - subchnl->cdsc_reladdr.msf.frame = buffer[15]; - subchnl->cdsc_absaddr.msf.minute = buffer[9]; - subchnl->cdsc_absaddr.msf.second = buffer[10]; - subchnl->cdsc_absaddr.msf.frame = buffer[11]; - - return 0; - } default: diff -ur --exclude-from /home/axboe/cdrom/exclude-from /tmp/linux-2.3.18/drivers/block/pdc4030.c linux/drivers/block/pdc4030.c --- /tmp/linux-2.3.18/drivers/block/pdc4030.c Sat Jun 26 17:34:20 1999 +++ linux/drivers/block/pdc4030.c Sun Sep 26 19:45:40 1999 @@ -162,6 +162,7 @@ if (!hwif) return 0; drive = &hwif->drives[0]; + drive->timeout = HZ/100; hwif2 = &ide_hwifs[hwif->index+1]; if (hwif->chipset == ide_pdc4030) /* we've already been found ! */ return 1; @@ -307,6 +308,9 @@ unsigned int sectors_left, sectors_avail, nsect; struct request *rq; + /* reset timeout */ + drive->timeout = HZ/100; + if (!OK_STAT(stat=GET_STAT(),DATA_READY,BAD_R_STAT)) { ide_error(drive, "promise_read_intr", stat); return; @@ -361,7 +365,8 @@ if (stat & DRQ_STAT) goto read_again; if (stat & BUSY_STAT) { - ide_set_handler (drive, &promise_read_intr, WAIT_CMD); + drive->timeout = WAIT_CMD; + ide_set_handler (drive, &promise_read_intr); #ifdef DEBUG_READ printk(KERN_DEBUG "%s: promise_read: waiting for" "interrupt\n", drive->name); @@ -390,7 +395,7 @@ if (GET_STAT() & BUSY_STAT) { if (time_before(jiffies, hwgroup->poll_timeout)) { - ide_set_handler(drive, &promise_complete_pollfunc, 1); + ide_set_handler(drive, &promise_complete_pollfunc); return; /* continue polling... */ } hwgroup->poll_timeout = 0; @@ -419,7 +424,7 @@ if (IN_BYTE(IDE_NSECTOR_REG) != 0) { if (time_before(jiffies, hwgroup->poll_timeout)) { - ide_set_handler (drive, &promise_write_pollfunc, 1); + ide_set_handler (drive, &promise_write_pollfunc); return; /* continue polling... */ } hwgroup->poll_timeout = 0; @@ -433,7 +438,7 @@ */ ide_multwrite(drive, 4); hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE; - ide_set_handler(drive, &promise_complete_pollfunc, 1); + ide_set_handler(drive, &promise_complete_pollfunc); #ifdef DEBUG_WRITE printk(KERN_DEBUG "%s: Done last 4 sectors - status = %02x\n", drive->name, GET_STAT()); @@ -466,7 +471,7 @@ if (rq->nr_sectors > 4) { ide_multwrite(drive, rq->nr_sectors - 4); hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE; - ide_set_handler (drive, &promise_write_pollfunc, 1); + ide_set_handler (drive, &promise_write_pollfunc); } else { /* * There are 4 or fewer sectors to transfer, do them all in one go @@ -474,7 +479,7 @@ */ ide_multwrite(drive, rq->nr_sectors); hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE; - ide_set_handler(drive, &promise_complete_pollfunc, 1); + ide_set_handler(drive, &promise_complete_pollfunc); #ifdef DEBUG_WRITE printk(KERN_DEBUG "%s: promise_write: <= 4 sectors, " "status = %02x\n", drive->name, GET_STAT()); @@ -517,7 +522,8 @@ printk(KERN_DEBUG "%s: read: waiting for " "interrupt\n", drive->name); #endif - ide_set_handler(drive, &promise_read_intr, WAIT_CMD); + drive->timeout = WAIT_CMD; + ide_set_handler(drive, &promise_read_intr); return; } udelay(1); diff -ur --exclude-from /home/axboe/cdrom/exclude-from /tmp/linux-2.3.18/drivers/cdrom/cdrom.c linux/drivers/cdrom/cdrom.c --- /tmp/linux-2.3.18/drivers/cdrom/cdrom.c Sun Sep 26 21:14:31 1999 +++ linux/drivers/cdrom/cdrom.c Sun Sep 26 19:16:46 1999 @@ -164,10 +164,28 @@ drivers are updated as well. -- Various other cleanups. + 3.04 Sep 12, 1999 - Jens Axboe + -- Fixed a couple of possible memory leaks (if an operation failed and + we didn't free the buffer before returning the error). + -- Integrated Uniform CD Changer handling from Richard Sharman + . + -- Defined CD_DVD and CD_CHANGER log levels. + -- Fixed the CDROMREADxxx ioctls. + -- CDROMPLAYTRKIND uses the GPCMD_PLAY_AUDIO_MSF command - too few + drives supported it. We loose the index part, however. + -- Small modifications to accomodate opens of /dev/hdc1, required + for ide-cd to handle multisession discs. + -- Export cdrom_mode_sense and cdrom_mode_select. + -- init_cdrom_command() for setting up a cgc command. + + 3.05 Sep 23, 1999 - Jens Axboe + -- Changed the interface for CDROM_SEND_PACKET. Before it was virtually + impossible to send the drive data in a sensible way. + -------------------------------------------------------------------------*/ -#define REVISION "Revision: 3.03" -#define VERSION "Id: cdrom.c 3.03 1999/09/01" +#define REVISION "Revision: 3.05" +#define VERSION "Id: cdrom.c 3.05 1999/09/23" /* I use an error-log mask to give fine grain control over the type of messages dumped to the system logs. The available masks include: */ @@ -178,6 +196,8 @@ #define CD_OPEN 0x8 #define CD_CLOSE 0x10 #define CD_COUNT_TRACKS 0x20 +#define CD_CHANGER 0x40 +#define CD_DVD 0x80 /* Define this to remove _all_ the debugging messages */ /* #define ERRLOGMASK CD_NOTHING */ @@ -198,6 +218,7 @@ #include #include #include +#include #include #include #include @@ -210,7 +231,8 @@ static int autoclose=1; static int autoeject=0; static int lockdoor = 1; -static int check_media_type = 1; +/* will we ever get to use this... sigh. */ +static int check_media_type = 0; MODULE_PARM(debug, "i"); MODULE_PARM(autoclose, "i"); MODULE_PARM(autoeject, "i"); @@ -286,6 +308,8 @@ */ #define ENSURE(call, bits) if (cdo->call == NULL) *change_capability &= ~(bits) +static int cdrom_setup_writemode(struct cdrom_device_info *cdi); + int register_cdrom(struct cdrom_device_info *cdi) { static char banner_printed = 0; @@ -300,7 +324,7 @@ if (cdo->open == NULL || cdo->release == NULL) return -2; if ( !banner_printed ) { - printk(KERN_INFO "Uniform CDROM driver " REVISION "\n"); + printk(KERN_INFO "Uniform CD-ROM driver " REVISION "\n"); banner_printed = 1; #ifdef CONFIG_SYSCTL cdrom_sysctl_register(); @@ -311,7 +335,6 @@ ENSURE(tray_move, CDC_CLOSE_TRAY | CDC_OPEN_TRAY); ENSURE(lock_door, CDC_LOCK); ENSURE(select_speed, CDC_SELECT_SPEED); - ENSURE(select_disc, CDC_SELECT_DISC); ENSURE(get_last_session, CDC_MULTI_SESSION); ENSURE(get_mcn, CDC_MCN); ENSURE(reset, CDC_RESET); @@ -334,6 +357,9 @@ cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name); cdi->next = topCdromPtr; topCdromPtr = cdi; + if (CDROM_CAN(CDC_CD_R) || CDROM_CAN(CDC_CD_RW) || CDROM_CAN(CDC_DVD_R)) + (void)cdrom_setup_writemode(cdi); + return 0; } #undef ENSURE @@ -374,6 +400,18 @@ cdi = topCdromPtr; while (cdi != NULL && cdi->dev != dev) cdi = cdi->next; + + /* we need to find the device this way when IDE devices such + * as /dev/hdc2 are opened. SCSI drives will be found above and + * so will /dev/hdc, for instance. + */ + if (cdi == NULL) { + kdev_t cd_dev = MKDEV(MAJOR(dev), MINOR(dev) | CD_PART_MASK); + cdi = topCdromPtr; + while (cdi != NULL && cdi->dev != cd_dev) + cdi = cdi->next; + } + return cdi; } @@ -579,7 +617,7 @@ int cdrom_release(struct inode *ip, struct file *fp) { kdev_t dev = ip->i_rdev; - struct cdrom_device_info *cdi = cdrom_find_device (dev); + struct cdrom_device_info *cdi = cdrom_find_device(dev); struct cdrom_device_ops *cdo = cdi->ops; int opened_for_data; @@ -610,6 +648,133 @@ return 0; } +static int cdrom_read_mech_status(struct cdrom_device_info *cdi, + struct cdrom_changer_info *buf) +{ + struct cdrom_generic_command cgc; + struct cdrom_device_ops *cdo = cdi->ops; + int length; + + length = sizeof(struct cdrom_mechstat_header) + + cdi->capacity * sizeof(struct cdrom_slot); + + init_cdrom_command(&cgc, buf, length); + cgc.cmd[0] = GPCMD_MECHANISM_STATUS; + cgc.cmd[8] = (length >> 8) & 0xff; + cgc.cmd[9] = length & 0xff; + return cdo->generic_packet(cdi, &cgc); +} + +static int cdrom_slot_status(struct cdrom_device_info *cdi, int slot) +{ + struct cdrom_changer_info info; + int ret; + + cdinfo(CD_CHANGER, "entering cdrom_slot_status()\n"); + if (cdi->sanyo_slot) + return CDS_NO_INFO; + + if ((ret = cdrom_read_mech_status(cdi, &info))) + return ret; + + if (info.slots[slot].disc_present) + return CDS_DISC_OK; + else + return CDS_NO_DISC; + +} + +/* Return the number of slots for an ATAPI/SCSI cdrom, + * return 1 if not a changer. + */ +int cdrom_number_of_slots(struct cdrom_device_info *cdi) +{ + int status; + int nslots = 1; + struct cdrom_changer_info info; + + cdinfo(CD_CHANGER, "entering cdrom_number_of_slots()\n"); + /* cdrom_read_mech_status requires a valid value for capacity: */ + cdi->capacity = 0; + + if ((status = cdrom_read_mech_status(cdi, &info)) == 0) + nslots = info.hdr.nslots; + + return nslots; +} + + +/* If SLOT < 0, unload the current slot. Otherwise, try to load SLOT. */ +static int cdrom_load_unload(struct cdrom_device_info *cdi, int slot) +{ + struct cdrom_generic_command cgc; + + cdinfo(CD_CHANGER, "entering cdrom_load_unload()\n"); + if (cdi->sanyo_slot && slot < 0) + return 0; + + init_cdrom_command(&cgc, NULL, 0); + cgc.cmd[0] = GPCMD_LOAD_UNLOAD; + cgc.cmd[4] = 2 + (slot >= 0); + cgc.cmd[8] = slot; + + /* The Sanyo 3 CD changer uses byte 7 of the + GPCMD_TEST_UNIT_READY to command to switch CDs instead of + using the GPCMD_LOAD_UNLOAD opcode. */ + if (cdi->sanyo_slot && slot) { + cgc.cmd[0] = GPCMD_TEST_UNIT_READY; + cgc.cmd[7] = slot; + cdi->sanyo_slot = slot ? slot : 3; + } + + return cdi->ops->generic_packet(cdi, &cgc); +} + +int cdrom_select_disc (struct cdrom_device_info *cdi, int slot) +{ + struct cdrom_changer_info info; + int curslot; + int ret; + + cdinfo(CD_CHANGER, "entering cdrom_select_disc()\n"); + if (!CDROM_CAN(CDC_SELECT_DISC)) + return -EDRIVE_CANT_DO_THIS; + + if (slot == CDSL_NONE) { + /* set media changed bits, on both queues */ + cdi->mc_flags = 0x3; + return cdrom_load_unload(cdi, -1); + } + + if ((ret = cdrom_read_mech_status(cdi, &info))) + return ret; + + curslot = info.hdr.curslot; + + if (cdi->use_count > 1 || keeplocked) { + if (slot == CDSL_CURRENT) { + return curslot; + } else { + return -EBUSY; + } + } + + /* Specifying CDSL_CURRENT will attempt to load the currnet slot, + which is useful if it had been previously unloaded. + Whether it can or not, it returns the current slot. + Similarly, if slot happens to be the current one, we still + try and load it. */ + if (slot == CDSL_CURRENT) + slot = curslot; + + /* set media changed bits on both queues */ + cdi->mc_flags = 0x3; + if ((ret = cdrom_load_unload(cdi, slot))) + return ret; + + return slot; +} + /* We want to make media_changed accessible to the user through an * ioctl. The main problem now is that we must double-buffer the * low-level implementation, to assure that the VFS and the user both @@ -636,7 +801,7 @@ static int cdrom_media_changed(kdev_t dev) { - struct cdrom_device_info *cdi = cdrom_find_device (dev); + struct cdrom_device_info *cdi = cdrom_find_device(dev); /* This talks to the VFS, which doesn't like errors - just 1 or 0. * Returning "0" is always safe (media hasn't been changed). Do that * if the low-level cdrom driver dosn't support media changed. */ @@ -734,6 +899,14 @@ *curr = requested; } +void init_cdrom_command(struct cdrom_generic_command *cgc, + void *buffer, int len) +{ + memset(cgc, 0, sizeof(*cgc)); + cgc->buffer = (char *) buffer; + cgc->buflen = len; +} + /* DVD handling */ #define copy_key(dest,src) memcpy((dest), (src), sizeof(dvd_key)) @@ -758,19 +931,16 @@ struct cdrom_generic_command cgc; struct cdrom_device_ops *cdo = cdi->ops; - memset(&cgc, 0, sizeof(cgc)); - memset(buf, 0x93, sizeof(buf)); - cgc.buffer = buf; + init_cdrom_command(&cgc, buf, 0); switch (ai->type) { /* LU data send */ case DVD_LU_SEND_AGID: - cdinfo(CD_DO_IOCTL, "entering DVD_LU_SEND_AGID\n"); + cdinfo(CD_DVD, "entering DVD_LU_SEND_AGID\n"); setup_report_key (&cgc, 0, 0); cgc.buflen = cgc.cmd[9] = 8; - ret = cdo->generic_packet(cdi, &cgc); - if (ret) + if ((ret = cdo->generic_packet(cdi, &cgc))) return ret; ai->lsa.agid = buf[7] >> 6; @@ -778,24 +948,24 @@ break; case DVD_LU_SEND_KEY1: - cdinfo(CD_DO_IOCTL, "entering DVD_LU_SEND_KEY1\n"); + cdinfo(CD_DVD, "entering DVD_LU_SEND_KEY1\n"); setup_report_key (&cgc, ai->lsk.agid, 2); cgc.buflen = cgc.cmd[9] = 12; - ret = cdo->generic_packet(cdi, &cgc); - if (ret) return ret; + if ((ret = cdo->generic_packet(cdi, &cgc))) + return ret; copy_key(ai->lsk.key, &buf[4]); /* Returning data, let host change state */ break; case DVD_LU_SEND_CHALLENGE: - cdinfo(CD_DO_IOCTL, "entering DVD_LU_SEND_CHALLENGE\n"); + cdinfo(CD_DVD, "entering DVD_LU_SEND_CHALLENGE\n"); setup_report_key (&cgc, ai->lsc.agid, 1); cgc.buflen = cgc.cmd[9] = 16; - ret = cdo->generic_packet(cdi, &cgc); - if (ret) return ret; + if ((ret = cdo->generic_packet(cdi, &cgc))) + return ret; copy_chal(ai->lsc.chal, &buf[4]); /* Returning data, let host change state */ @@ -803,7 +973,7 @@ /* Post-auth key */ case DVD_LU_SEND_TITLE_KEY: - cdinfo(CD_DO_IOCTL, "entering DVD_LU_SEND_TITLE_KEY\n"); + cdinfo(CD_DVD, "entering DVD_LU_SEND_TITLE_KEY\n"); setup_report_key (&cgc, ai->lstk.agid, 4); cgc.cmd[5] = ai->lstk.lba; cgc.cmd[4] = ai->lstk.lba >> 8; @@ -811,8 +981,8 @@ cgc.cmd[2] = ai->lstk.lba >> 24; cgc.buflen = cgc.cmd[9] = 12; - ret = cdo->generic_packet(cdi, &cgc); - if (ret) return ret; + if ((ret = cdo->generic_packet(cdi, &cgc))) + return ret; ai->lstk.cpm = (buf[4] >> 7) & 1; ai->lstk.cp_sec = (buf[4] >> 6) & 1; @@ -822,32 +992,32 @@ break; case DVD_LU_SEND_ASF: - cdinfo(CD_DO_IOCTL, "entering DVD_LU_SEND_ASF\n"); + cdinfo(CD_DVD, "entering DVD_LU_SEND_ASF\n"); setup_report_key (&cgc, ai->lsasf.asf, 5); cgc.buflen = cgc.cmd[9] = 8; - - ret = cdo->generic_packet(cdi, &cgc); - if (ret) return ret; + + if ((ret = cdo->generic_packet(cdi, &cgc))) + return ret; ai->lsasf.asf = buf[7] & 1; break; /* LU data receive (LU changes state) */ case DVD_HOST_SEND_CHALLENGE: - cdinfo(CD_DO_IOCTL, "entering DVD_HOST_SEND_CHALLENGE\n"); + cdinfo(CD_DVD, "entering DVD_HOST_SEND_CHALLENGE\n"); setup_send_key (&cgc, ai->hsc.agid, 1); cgc.buflen = cgc.cmd[9] = 16; buf[1] = 14; copy_chal (&buf[4], ai->hsc.chal); - ret = cdo->generic_packet(cdi, &cgc); - if (ret) return ret; + if ((ret = cdo->generic_packet(cdi, &cgc))) + return ret; ai->type = DVD_LU_SEND_KEY1; break; case DVD_HOST_SEND_KEY2: - cdinfo(CD_DO_IOCTL, "entering DVD_HOST_SEND_KEY2\n"); + cdinfo(CD_DVD, "entering DVD_HOST_SEND_KEY2\n"); setup_send_key (&cgc, ai->hsk.agid, 3); cgc.buflen = cgc.cmd[9] = 12; buf[1] = 10; @@ -863,10 +1033,10 @@ /* Misc */ case DVD_INVALIDATE_AGID: - cdinfo(CD_DO_IOCTL, "entering DVD_INVALIDATE_AGID\n"); + cdinfo(CD_DVD, "entering DVD_INVALIDATE_AGID\n"); setup_report_key (&cgc, ai->lsa.agid, 0x3f); - ret = cdo->generic_packet(cdi, &cgc); - if (ret) return ret; + if ((ret = cdo->generic_packet(cdi, &cgc))) + return ret; break; default: @@ -886,16 +1056,14 @@ struct cdrom_device_ops *cdo = cdi->ops; memset(buf, 0, sizeof(buf)); - memset(&cgc, 0, sizeof(cgc)); - cgc.buffer = buf; - cgc.buflen = sizeof(buf); + init_cdrom_command(&cgc, buf, sizeof(buf)); cgc.cmd[0] = GPCMD_READ_DVD_STRUCTURE; cgc.cmd[6] = s->physical.layer_num; cgc.cmd[7] = s->type; cgc.cmd[9] = cgc.buflen & 0xff; - ret = cdo->generic_packet(cdi, &cgc); - if (ret) return ret; + if ((ret = cdo->generic_packet(cdi, &cgc))) + return ret; base = &buf[4]; layer = &s->physical.layer[0]; @@ -930,17 +1098,14 @@ struct cdrom_device_ops *cdo = cdi->ops; memset(buf, 0, sizeof(buf)); - memset(&cgc, 0, sizeof(cgc)); - cgc.buffer = buf; - cgc.buflen = sizeof(buf); + init_cdrom_command(&cgc, buf, sizeof(buf)); cgc.cmd[0] = GPCMD_READ_DVD_STRUCTURE; cgc.cmd[6] = s->copyright.layer_num; cgc.cmd[7] = s->type; cgc.cmd[8] = cgc.buflen >> 8; cgc.cmd[9] = cgc.buflen & 0xff; - ret = cdo->generic_packet(cdi, &cgc); - if (ret) + if ((ret = cdo->generic_packet(cdi, &cgc))) return ret; s->copyright.cpst = buf[4]; @@ -957,20 +1122,17 @@ struct cdrom_device_ops *cdo = cdi->ops; memset(buf, 0, sizeof (buf)); - memset(&cgc, 0, sizeof (cgc)); - - cgc.buffer = buf; - cgc.buflen = sizeof(buf); + init_cdrom_command(&cgc, buf, sizeof(buf)); cgc.cmd[0] = GPCMD_READ_DVD_STRUCTURE; cgc.cmd[7] = s->type; cgc.cmd[8] = sizeof(buf) >> 8; cgc.cmd[9] = cgc.buflen & 0xff; cgc.cmd[10] = s->disckey.agid << 6; - ret = cdo->generic_packet(cdi, &cgc); - if (ret) return ret; + if ((ret = cdo->generic_packet(cdi, &cgc))) + return ret; - memcpy (s->disckey.value, &buf[4], 2048); + memcpy(s->disckey.value, &buf[4], 2048); return 0; } @@ -983,15 +1145,13 @@ struct cdrom_device_ops *cdo = cdi->ops; memset(buf, 0, sizeof (buf)); - memset(&cgc, 0, sizeof (cgc)); - cgc.buffer = buf; - cgc.buflen = sizeof(buf); + init_cdrom_command(&cgc, buf, sizeof(buf)); cgc.cmd[0] = GPCMD_READ_DVD_STRUCTURE; cgc.cmd[7] = s->type; cgc.cmd[9] = cgc.buflen = 0xff; - ret = cdo->generic_packet(cdi, &cgc); - if (ret) return ret; + if ((ret = cdo->generic_packet(cdi, &cgc))) + return ret; s->bca.len = buf[0] << 8 | buf[1]; if (s->bca.len < 12 || s->bca.len > 188) { @@ -1011,16 +1171,15 @@ struct cdrom_device_ops *cdo = cdi->ops; memset(buf, 0, sizeof(buf)); - memset(&cgc, 0, sizeof(cgc)); - cgc.buffer = buf; + init_cdrom_command(&cgc, buf, sizeof(buf)); cgc.cmd[0] = GPCMD_READ_DVD_STRUCTURE; cgc.cmd[7] = s->type; cgc.buflen = sizeof(buf); cgc.cmd[8] = sizeof(buf) >> 8; cgc.cmd[9] = cgc.buflen & 0xff; - ret = cdo->generic_packet(cdi, &cgc); - if (ret) return ret; + if ((ret = cdo->generic_packet(cdi, &cgc))) + return ret; s->manufact.len = buf[0] << 8 | buf[1]; if (s->manufact.len < 0 || s->manufact.len > 2048) { @@ -1057,9 +1216,9 @@ } } -static int cdrom_mode_sense(struct cdrom_device_info *cdi, - struct cdrom_generic_command *cgc, - int page_code, int page_control) +int cdrom_mode_sense(struct cdrom_device_info *cdi, + struct cdrom_generic_command *cgc, + int page_code, int page_control) { struct cdrom_device_ops *cdo = cdi->ops; @@ -1072,8 +1231,8 @@ return cdo->generic_packet(cdi, cgc); } -static int cdrom_mode_select(struct cdrom_device_info *cdi, - struct cdrom_generic_command *cgc) +int cdrom_mode_select(struct cdrom_device_info *cdi, + struct cdrom_generic_command *cgc) { struct cdrom_device_ops *cdo = cdi->ops; @@ -1094,13 +1253,12 @@ char buffer[32]; int ret; - memset(&cgc, 0, sizeof(cgc)); + init_cdrom_command(&cgc, buffer, 16); cgc.cmd[0] = GPCMD_READ_SUBCHANNEL; cgc.cmd[1] = 2; /* MSF addressing */ cgc.cmd[2] = 0x40; /* request subQ data */ cgc.cmd[3] = mcn ? 2 : 1; - cgc.cmd[8] = cgc.buflen = 16; - cgc.buffer = buffer; + cgc.cmd[8] = 16; if ((ret = cdo->generic_packet(cdi, &cgc))) return ret; @@ -1138,12 +1296,16 @@ cgc->cmd[4] = (lba >> 8) & 0xff; cgc->cmd[5] = lba & 0xff; /* number of blocks */ - cgc->cmd[8] = nblocks; + cgc->cmd[6] = (nblocks >> 16) & 0xff; + cgc->cmd[7] = (nblocks >> 8) & 0xff; + cgc->cmd[8] = nblocks & 0xff; cgc->buflen = blksize * nblocks; + + /* set the header info returned */ switch (blksize) { - case CD_FRAMESIZE_RAW0 : cgc->cmd[9] = 0x58; - case CD_FRAMESIZE_RAW1 : cgc->cmd[9] = 0x78; - case CD_FRAMESIZE_RAW : cgc->cmd[9] = 0xf8; + case CD_FRAMESIZE_RAW0 : cgc->cmd[9] = 0x58; break; + case CD_FRAMESIZE_RAW1 : cgc->cmd[9] = 0x78; break; + case CD_FRAMESIZE_RAW : cgc->cmd[9] = 0xf8; break; default : cgc->cmd[9] = 0x10; } @@ -1168,7 +1330,7 @@ unsigned int cmd, unsigned long arg) { kdev_t dev = ip->i_rdev; - struct cdrom_device_info *cdi = cdrom_find_device (dev); + struct cdrom_device_info *cdi = cdrom_find_device(dev); struct cdrom_device_ops *cdo; int ret; @@ -1235,15 +1397,22 @@ } case CDROM_MEDIA_CHANGED: { + struct cdrom_changer_info info; + cdinfo(CD_DO_IOCTL, "entering CDROM_MEDIA_CHANGED\n"); if (!CDROM_CAN(CDC_MEDIA_CHANGED)) return -ENOSYS; if (!CDROM_CAN(CDC_SELECT_DISC) || arg == CDSL_CURRENT) /* cannot select disc or select current disc */ return media_changed(cdi, 1); - if ((unsigned int)arg >= cdi->capacity) + if ((unsigned int)arg >= cdi->capacity) { return -EINVAL; - return cdo->media_changed (cdi, arg); + } + + if ((ret = cdrom_read_mech_status(cdi, &info))) + return ret; + + return info.slots[arg].change; } case CDROM_SET_OPTIONS: { @@ -1286,11 +1455,22 @@ cdinfo(CD_DO_IOCTL, "entering CDROM_SELECT_DISC\n"); if (!CDROM_CAN(CDC_SELECT_DISC)) return -ENOSYS; - if ((arg == CDSL_CURRENT) || (arg == CDSL_NONE)) - return cdo->select_disc(cdi, arg); - if ((int)arg >= cdi->capacity) + + if ((arg != CDSL_CURRENT) && (arg != CDSL_NONE)) { + if ((int)arg >= cdi->capacity) return -EINVAL; - return cdo->select_disc(cdi, arg); + } + /* cdo->select_disc is a hook to allow a driver-specific + * way of seleting disc. However, since there is no + * equiv hook for cdrom_slot_status this may not + * actually be useful... + */ + if (cdo->select_disc != NULL) + return cdo->select_disc(cdi, arg); + + /* no driver specific select_disc(), call our own */ + cdinfo(CD_CHANGER, "Using generic cdrom_select_disc()\n"); + return cdrom_select_disc(cdi, arg); } case CDROMRESET: { @@ -1304,12 +1484,10 @@ case CDROM_LOCKDOOR: { cdinfo(CD_DO_IOCTL, "%socking door.\n", arg ? "L" : "Unl"); - if (!CDROM_CAN(CDC_LOCK)) { + if (!CDROM_CAN(CDC_LOCK)) return -EDRIVE_CANT_DO_THIS; - } else { - keeplocked = arg ? 1 : 0; - return cdo->lock_door(cdi, arg); - } + keeplocked = arg ? 1 : 0; + return cdo->lock_door(cdi, arg); } case CDROM_DEBUG: { @@ -1352,7 +1530,7 @@ return cdo->drive_status(cdi, CDSL_CURRENT); if (((int)arg >= cdi->capacity)) return -EINVAL; - return cdo->drive_status(cdi, arg); + return cdrom_slot_status(cdi, arg); } /* Ok, this is where problems start. The current interface for the @@ -1383,7 +1561,8 @@ if (tracks.audio > 0) { if (tracks.data==0 && tracks.cdi==0 && tracks.xa==0) return CDS_AUDIO; - else return CDS_MIXED; + else + return CDS_MIXED; } if (tracks.cdi > 0) return CDS_XA_2_2; if (tracks.xa > 0) return CDS_XA_2_1; @@ -1533,8 +1712,8 @@ unsigned long arg) { struct cdrom_device_ops *cdo = cdi->ops; - kdev_t dev = cdi->dev; struct cdrom_generic_command cgc; + kdev_t dev = cdi->dev; char buffer[32]; int ret = 0; @@ -1552,15 +1731,13 @@ switch (cmd) { case CDROMREADRAW: blocksize = CD_FRAMESIZE_RAW; - format = 0; break; case CDROMREADMODE1: - blocksize = CD_FRAMESIZE; break; + blocksize = CD_FRAMESIZE; format = 2; break; case CDROMREADMODE2: - blocksize = CD_FRAMESIZE_RAW0; break; - format = 0; + blocksize = CD_FRAMESIZE_RAW0; break; } IOCTL_IN(arg, struct cdrom_msf, msf); @@ -1574,7 +1751,7 @@ ret = cdrom_read_block(cdi, &cgc, lba, 1, format, blocksize); if (!ret) if (copy_to_user((char *)arg, cgc.buffer, blocksize)) - return -EFAULT; + ret = -EFAULT; kfree(cgc.buffer); return ret; } @@ -1606,8 +1783,10 @@ GFP_KERNEL)) == NULL) return -ENOMEM; - if (!access_ok(VERIFY_WRITE, ra.buf, ra.nframes*CD_FRAMESIZE_RAW)) + if (!access_ok(VERIFY_WRITE, ra.buf, ra.nframes*CD_FRAMESIZE_RAW)) { + kfree(cgc.buffer); return -EFAULT; + } while (ra.nframes > 0) { ret = cdrom_read_block(cdi, &cgc, lba, ra.nframes, 1, @@ -1642,13 +1821,29 @@ } case CDROMPLAYTRKIND: { struct cdrom_ti ti; + struct cdrom_tocentry entry; + cdinfo(CD_DO_IOCTL, "entering CDROMPLAYTRKIND\n"); IOCTL_IN(arg, struct cdrom_ti, ti); - cgc.cmd[0] = GPCMD_PLAYAUDIO_TI; - cgc.cmd[4] = ti.cdti_trk0; - cgc.cmd[5] = ti.cdti_ind0; - cgc.cmd[7] = ti.cdti_trk1; - cgc.cmd[8] = ti.cdti_ind1; + entry.cdte_format = CDROM_MSF; + + /* get toc entry for start and end track */ + entry.cdte_track = ti.cdti_trk0; + if (cdi->ops->audio_ioctl(cdi, CDROMREADTOCENTRY, &entry)) + return -EINVAL; + + cgc.cmd[3] = entry.cdte_addr.msf.minute; + cgc.cmd[4] = entry.cdte_addr.msf.second; + cgc.cmd[5] = entry.cdte_addr.msf.frame; + + entry.cdte_track = ti.cdti_trk1; + if (cdi->ops->audio_ioctl(cdi, CDROMREADTOCENTRY, &entry)) + return -EINVAL; + + cgc.cmd[6] = entry.cdte_addr.msf.minute; + cgc.cmd[7] = entry.cdte_addr.msf.second; + cgc.cmd[8] = entry.cdte_addr.msf.frame; + cgc.cmd[0] = GPCMD_PLAY_AUDIO_MSF; return cdo->generic_packet(cdi, &cgc); } case CDROMPLAYMSF: { @@ -1669,12 +1864,12 @@ cdinfo(CD_DO_IOCTL, "entering CDROMPLAYBLK\n"); IOCTL_IN(arg, struct cdrom_blk, blk); cgc.cmd[0] = GPCMD_PLAY_AUDIO_10; - cgc.cmd[2] = blk.from >> 24; - cgc.cmd[3] = blk.from >> 16; - cgc.cmd[4] = blk.from >> 8; - cgc.cmd[5] = blk.from; - cgc.cmd[7] = blk.len >> 8; - cgc.cmd[8] = blk.len; + cgc.cmd[2] = (blk.from >> 24) & 0xff; + cgc.cmd[3] = (blk.from >> 16) & 0xff; + cgc.cmd[4] = (blk.from >> 8) & 0xff; + cgc.cmd[5] = blk.from & 0xff; + cgc.cmd[7] = (blk.len >> 8) & 0xff; + cgc.cmd[8] = blk.len & 0xff; return cdo->generic_packet(cdi, &cgc); } case CDROMVOLCTRL: @@ -1688,8 +1883,7 @@ cgc.buffer = buffer; cgc.buflen = 24; - if ((ret = cdrom_mode_sense(cdi, &cgc, - GPMODE_AUDIO_CTL_PAGE, 0))) + if ((ret = cdrom_mode_sense(cdi, &cgc, GPMODE_AUDIO_CTL_PAGE, 0))) return ret; /* some drives have longer pages, adjust and reread. */ @@ -1736,7 +1930,7 @@ case CDROMSTART: case CDROMSTOP: { - cdinfo(CD_DO_IOCTL, "entering audio ioctl (start/stop)\n"); + cdinfo(CD_DO_IOCTL, "entering CDROMSTART/CDROMSTOP\n"); cgc.cmd[0] = GPCMD_START_STOP_UNIT; cgc.cmd[1] = 1; cgc.cmd[4] = (cmd == CDROMSTART) ? 1 : 0; @@ -1745,7 +1939,7 @@ case CDROMPAUSE: case CDROMRESUME: { - cdinfo(CD_DO_IOCTL, "entering audio ioctl (pause/resume)\n"); + cdinfo(CD_DO_IOCTL, "entering CDROMPAUSE/CDROMRESUME\n"); cgc.cmd[0] = GPCMD_PAUSE_RESUME; cgc.cmd[8] = (cmd == CDROMRESUME) ? 1 : 0; return cdo->generic_packet(cdi, &cgc); @@ -1755,20 +1949,19 @@ dvd_struct s; if (!CDROM_CAN(CDC_DVD)) return -ENOSYS; - cdinfo(CD_DO_IOCTL, "entering dvd_read_struct\n"); + cdinfo(CD_DO_IOCTL, "entering DVD_READ_STRUCT\n"); IOCTL_IN(arg, dvd_struct, s); - if ((ret = dvd_read_struct(cdi, &s)) == 0) { - IOCTL_OUT(arg, dvd_struct, s); - return 0; - } - return ret; + if ((ret = dvd_read_struct(cdi, &s))) + return ret; + IOCTL_OUT(arg, dvd_struct, s); + return 0; } case DVD_AUTH: { dvd_authinfo ai; if (!CDROM_CAN(CDC_DVD)) return -ENOSYS; - cdinfo(CD_DO_IOCTL, "entering dvd_auth\n"); + cdinfo(CD_DO_IOCTL, "entering DVD_AUTH\n"); IOCTL_IN(arg, dvd_authinfo, ai); if ((ret = dvd_do_auth (cdi, &ai))) return ret; @@ -1777,28 +1970,58 @@ } case CDROM_SEND_PACKET: { + __u8 *userbuf, copy = 0; if (!CDROM_CAN(CDC_GENERIC_PACKET)) return -ENOSYS; - cdinfo(CD_DO_IOCTL, "entering send_packet\n"); + cdinfo(CD_DO_IOCTL, "entering CDROM_SEND_PACKET\n"); IOCTL_IN(arg, struct cdrom_generic_command, cgc); - cgc.buffer = kmalloc(cgc.buflen, GFP_KERNEL); - ret = cdo->generic_packet(cdi, &cgc); - if (copy_to_user((void*)arg, cgc.buffer, cgc.buflen)) { - kfree(cgc.buffer); - return -EFAULT; + copy = !!cgc.buflen; + userbuf = cgc.buffer; + cgc.buffer = NULL; + if (userbuf != NULL && copy) { + /* usually commands just copy data one way, i.e. + * we send a buffer to the drive and the command + * specifies whether the drive will read or + * write to that buffer. usually the buffers + * are very small, so we don't loose that much + * by doing a redundant copy each time. */ + if (!access_ok(VERIFY_WRITE, userbuf, cgc.buflen)) { + printk("can't get write perms\n"); + return -EFAULT; + } + if (!access_ok(VERIFY_READ, userbuf, cgc.buflen)) { + printk("can't get read perms\n"); + return -EFAULT; + } + } + /* reasonable limits */ + if (cgc.buflen < 0 || cgc.buflen > 131072) { + printk("invalid size given\n"); + return -EINVAL; } + if (copy) { + cgc.buffer = kmalloc(cgc.buflen, GFP_KERNEL); + if (cgc.buffer == NULL) + return -ENOMEM; + __copy_from_user(cgc.buffer, userbuf, cgc.buflen); + } + ret = cdo->generic_packet(cdi, &cgc); + if (copy && !ret) + __copy_to_user(userbuf, cgc.buffer, cgc.buflen); kfree(cgc.buffer); return ret; } case CDROM_NEXT_WRITABLE: { - long next; + long next = 0; + cdinfo(CD_DO_IOCTL, "entering CDROM_NEXT_WRITABLE\n"); if ((ret = cdrom_get_next_writable(dev, &next))) return ret; IOCTL_OUT(arg, long, next); return 0; } case CDROM_LAST_WRITTEN: { - long last; + long last = 0; + cdinfo(CD_DO_IOCTL, "entering CDROM_LAST_WRITTEN\n"); if ((ret = cdrom_get_last_written(dev, &last))) return ret; IOCTL_OUT(arg, long, last); @@ -1810,23 +2033,22 @@ } static int cdrom_get_track_info(kdev_t dev, __u16 track, __u8 type, - track_information *ti) + track_information *ti) { - struct cdrom_device_info *cdi = cdrom_find_device (dev); + struct cdrom_device_info *cdi = cdrom_find_device(dev); struct cdrom_device_ops *cdo = cdi->ops; struct cdrom_generic_command cgc; int ret; - memset(&cgc, 0, sizeof(cgc)); + init_cdrom_command(&cgc, ti, 8); cgc.cmd[0] = GPCMD_READ_TRACK_RZONE_INFO; cgc.cmd[1] = type & 3; cgc.cmd[4] = (track & 0xff00) >> 8; cgc.cmd[5] = track & 0xff; - cgc.cmd[8] = cgc.buflen = 8; - cgc.buffer = (char *)ti; + cgc.cmd[8] = 8; - ret = cdo->generic_packet(cdi, &cgc); - if (ret) return ret; + if ((ret = cdo->generic_packet(cdi, &cgc))) + return ret; cgc.cmd[8] = cgc.buflen = be16_to_cpu(ti->track_information_length) + sizeof(ti->track_information_length); @@ -1835,16 +2057,15 @@ static int cdrom_get_disc_info(kdev_t dev, disc_information *di) { - struct cdrom_device_info *cdi = cdrom_find_device (dev); + struct cdrom_device_info *cdi = cdrom_find_device(dev); struct cdrom_device_ops *cdo = cdi->ops; struct cdrom_generic_command cgc; /* set up command and get the disc info */ - memset(&cgc, 0, sizeof(cgc)); + init_cdrom_command(&cgc, di, sizeof(*di)); memset(di, 0, sizeof(disc_information)); cgc.cmd[0] = GPCMD_READ_DISC_INFO; - cgc.cmd[8] = cgc.buflen = sizeof(*di); - cgc.buffer = (char *)di; + cgc.cmd[8] = cgc.buflen; return cdo->generic_packet(cdi, &cgc); } @@ -1854,16 +2075,16 @@ file system. */ int cdrom_get_last_written(kdev_t dev, long *last_written) { - struct cdrom_device_info *cdi = cdrom_find_device (dev); + struct cdrom_device_info *cdi = cdrom_find_device(dev); struct cdrom_tocentry toc; disc_information di; track_information ti; __u32 last_track; int ret = -1; - + if (!CDROM_CAN(CDC_GENERIC_PACKET)) goto use_toc; - + if ((ret = cdrom_get_disc_info(dev, &di))) goto use_toc; @@ -1906,12 +2127,12 @@ /* return the next writable block. also for udf file system. */ int cdrom_get_next_writable(kdev_t dev, long *next_writable) { - struct cdrom_device_info *cdi = cdrom_find_device (dev); + struct cdrom_device_info *cdi = cdrom_find_device(dev); disc_information di; track_information ti; __u16 last_track; int ret = -1; - + if (!CDROM_CAN(CDC_GENERIC_PACKET)) goto use_last_written; @@ -1947,12 +2168,69 @@ } } +/* return 0 if succesful and the disc can be considered writeable. */ +static int cdrom_setup_writemode(struct cdrom_device_info *cdi) +{ + struct cdrom_generic_command cgc; + write_param_page wp; + disc_information di; + track_information ti; + int ret, last_track; + + memset(&di, 0, sizeof(disc_information)); + memset(&ti, 0, sizeof(track_information)); + memset(&wp, 0, sizeof(write_param_page)); + + if ((ret = cdrom_get_disc_info(cdi->dev, &di))) + return ret; + + last_track = (di.last_track_msb << 8) | di.last_track_lsb; + if ((ret = cdrom_get_track_info(cdi->dev, last_track, 1, &ti))) + return ret; + + init_cdrom_command(&cgc, &wp, 0x3c); + if ((ret = cdrom_mode_sense(cdi, &cgc, GPMODE_WRITE_PARMS_PAGE, 0))) + return ret; + + /* sanity checks */ + if ((ti.damage && !ti.nwa_v) || ti.blank) + return 1; + + cdi->packet_size = wp.packet_size = be32_to_cpu(ti.fixed_packet_size); + cdi->nwa = ti.nwa_v ? be32_to_cpu(ti.next_writable) : 0; + wp.track_mode = ti.track_mode; + /* write_type 0 == packet/incremental writing */ + wp.write_type = 0; + + /* MODE1 or MODE2 writing */ + switch (ti.data_mode) { + case 1: wp.data_block_type = 8; break; + case 2: wp.data_block_type = 13; break; + default: return 1; + } + + if ((ret = cdrom_mode_select(cdi, &cgc))) + return ret; + + printk("%s: writeable with %s packets of %lu in length", cdi->name, + wp.fp ? "fixed" : "variable", + (unsigned long)cdi->packet_size); + printk(", nwa = %lu\n", (unsigned long)cdi->nwa); + + return 0; +} + EXPORT_SYMBOL(cdrom_get_next_writable); EXPORT_SYMBOL(cdrom_get_last_written); EXPORT_SYMBOL(cdrom_count_tracks); EXPORT_SYMBOL(register_cdrom); EXPORT_SYMBOL(unregister_cdrom); EXPORT_SYMBOL(cdrom_fops); +EXPORT_SYMBOL(cdrom_number_of_slots); +EXPORT_SYMBOL(cdrom_select_disc); +EXPORT_SYMBOL(cdrom_mode_select); +EXPORT_SYMBOL(cdrom_mode_sense); +EXPORT_SYMBOL(init_cdrom_command); #ifdef CONFIG_SYSCTL @@ -2207,16 +2485,13 @@ { unregister_sysctl_table(cdrom_sysctl_header); } -#endif /* endif MODULE */ #endif /* endif CONFIG_SYSCTL */ -#ifdef MODULE - int init_module(void) { #ifdef CONFIG_SYSCTL cdrom_sysctl_register(); -#endif /* CONFIG_SYSCTL */ +#endif return 0; } @@ -2227,5 +2502,5 @@ cdrom_sysctl_unregister(); #endif /* CONFIG_SYSCTL */ } - #endif /* endif MODULE */ + diff -ur --exclude-from /home/axboe/cdrom/exclude-from /tmp/linux-2.3.18/drivers/scsi/ide-scsi.c linux/drivers/scsi/ide-scsi.c --- /tmp/linux-2.3.18/drivers/scsi/ide-scsi.c Sun Sep 26 21:14:37 1999 +++ linux/drivers/scsi/ide-scsi.c Sun Sep 26 21:14:05 1999 @@ -299,11 +299,6 @@ scsi->pc = NULL; } -static inline unsigned long get_timeout(idescsi_pc_t *pc) -{ - return IDE_MAX(WAIT_CMD, pc->timeout - jiffies); -} - /* * Our interrupt handler. */ @@ -364,7 +359,8 @@ pc->actually_transferred += temp; pc->current_position += temp; idescsi_discard_data (drive,bcount - temp); - ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc)); + drive->timeout = IDE_MAX(WAIT_CMD, pc->timeout - jiffies); + ide_set_handler(drive, &idescsi_pc_intr); return; } #if IDESCSI_DEBUG_LOG @@ -388,7 +384,8 @@ pc->actually_transferred+=bcount; /* Update the current position */ pc->current_position+=bcount; - ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc)); /* And set the interrupt handler again */ + drive->timeout = IDE_MAX(WAIT_CMD, pc->timeout - jiffies); + ide_set_handler(drive, &idescsi_pc_intr); /* And set the interrupt handler again */ } static void idescsi_transfer_pc (ide_drive_t *drive) @@ -407,7 +404,8 @@ ide_do_reset (drive); return; } - ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc)); /* Set the interrupt routine */ + drive->timeout = IDE_MAX(WAIT_CMD, pc->timeout - jiffies); + ide_set_handler(drive, &idescsi_pc_intr); /* Set the interrupt routine */ atapi_output_bytes (drive, scsi->pc->c, 12); /* Send the actual packet */ } @@ -441,7 +439,8 @@ (void) (HWIF(drive)->dmaproc(ide_dma_begin, drive)); } if (test_bit (IDESCSI_DRQ_INTERRUPT, &scsi->flags)) { - ide_set_handler (drive, &idescsi_transfer_pc, get_timeout(pc)); + drive->timeout = IDE_MAX(WAIT_CMD, pc->timeout - jiffies); + ide_set_handler (drive, &idescsi_transfer_pc); OUT_BYTE (WIN_PACKETCMD, IDE_COMMAND_REG); /* Issue the packet command */ } else { OUT_BYTE (WIN_PACKETCMD, IDE_COMMAND_REG); diff -ur --exclude-from /home/axboe/cdrom/exclude-from /tmp/linux-2.3.18/drivers/scsi/sr.c linux/drivers/scsi/sr.c --- /tmp/linux-2.3.18/drivers/scsi/sr.c Sun Sep 26 21:14:38 1999 +++ linux/drivers/scsi/sr.c Sun Sep 26 16:46:50 1999 @@ -47,7 +47,9 @@ #include /* For the door lock/unlock commands */ #include "constants.h" +#ifdef MODULE MODULE_PARM(xa_test, "i"); /* see sr_ioctl.c */ +#endif #define MAX_RETRIES 3 #define SR_TIMEOUT (30 * HZ) @@ -106,9 +108,10 @@ sr_audio_ioctl, /* audio ioctl */ sr_dev_ioctl, /* device-specific ioctl */ CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | CDC_SELECT_SPEED | - CDC_MULTI_SESSION | CDC_MCN | CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO | - CDC_RESET | CDC_IOCTLS | CDC_DRIVE_STATUS | CDC_CD_R | CDC_CD_RW | - CDC_DVD | CDC_DVD_R | CDC_DVD_RAM | CDC_GENERIC_PACKET, + CDC_SELECT_DISC | CDC_MULTI_SESSION | CDC_MCN | CDC_MEDIA_CHANGED | + CDC_PLAY_AUDIO | CDC_RESET | CDC_IOCTLS | CDC_DRIVE_STATUS | + CDC_CD_R | CDC_CD_RW | CDC_DVD | CDC_DVD_R | CDC_DVD_RAM | + CDC_GENERIC_PACKET, 0, sr_packet }; @@ -858,7 +861,6 @@ unsigned char *buffer; int the_result, retries; Scsi_Cmnd *SCpnt; - unsigned long flags; buffer = (unsigned char *) scsi_malloc(512); SCpnt = scsi_allocate_device(NULL, scsi_CDs[i].device, 1); @@ -874,17 +876,9 @@ memset(buffer, 0, 8); /* Do the command and wait.. */ - { - DECLARE_MUTEX_LOCKED(sem); - SCpnt->request.sem = &sem; - spin_lock_irqsave(&io_request_lock, flags); - scsi_do_cmd(SCpnt, - (void *) cmd, (void *) buffer, - 512, sr_init_done, SR_TIMEOUT, - MAX_RETRIES); - spin_unlock_irqrestore(&io_request_lock, flags); - down(&sem); - } + + scsi_wait_cmd (SCpnt, (void *) cmd, (void *) buffer, + 512, sr_init_done, SR_TIMEOUT, MAX_RETRIES); the_result = SCpnt->result; retries--; @@ -958,7 +952,7 @@ "pop-up", "", "changer", - "changer", + "cartridge changer", "", "" }; @@ -1010,6 +1004,20 @@ if ((buffer[n + 3] & 0x1) == 0) /* can't write CD-R media */ scsi_CDs[i].cdi.mask |= CDC_CD_R; + if ((buffer[n+6] & 0x8) == 0) + /* can't eject */ + scsi_CDs[i].cdi.mask |= CDC_OPEN_TRAY; + + if ((buffer[n+6] >> 5) == mechtype_individual_changer || + (buffer[n+6] >> 5) == mechtype_cartridge_changer) + scsi_CDs[i].cdi.capacity = + cdrom_number_of_slots(&(scsi_CDs[i].cdi)); + if (scsi_CDs[i].cdi.capacity <= 1) + /* not a changer */ + scsi_CDs[i].cdi.mask |= CDC_SELECT_DISC; + /*else I don't think it can close its tray + scsi_CDs[i].cdi.mask |= CDC_CLOSE_TRAY; */ + scsi_free(buffer, 512); } @@ -1022,8 +1030,6 @@ { Scsi_Cmnd *SCpnt; Scsi_Device *device = scsi_CDs[MINOR(cdi->dev)].device; - DECLARE_MUTEX_LOCKED(sem); - unsigned long flags; int stat; /* get the device */ @@ -1036,15 +1042,11 @@ /* do the locking and issue the command */ SCpnt->request.rq_dev = cdi->dev; - SCpnt->request.rq_status = RQ_SCSI_BUSY; /* scsi_do_cmd sets the command length */ SCpnt->cmd_len = 0; - SCpnt->request.sem = &sem; - spin_lock_irqsave(&io_request_lock, flags); - scsi_do_cmd(SCpnt, (void *) cgc->cmd, (void *) cgc->buffer, cgc->buflen, - sr_init_done, SR_TIMEOUT, MAX_RETRIES); - spin_unlock_irqrestore(&io_request_lock, flags); - down(&sem); + + scsi_wait_cmd (SCpnt, (void *)cgc->cmd, (void *)cgc->buffer, cgc->buflen, + sr_init_done, SR_TIMEOUT, MAX_RETRIES); stat = SCpnt->result; diff -ur --exclude-from /home/axboe/cdrom/exclude-from /tmp/linux-2.3.18/drivers/scsi/sr_ioctl.c linux/drivers/scsi/sr_ioctl.c --- /tmp/linux-2.3.18/drivers/scsi/sr_ioctl.c Sun Sep 26 21:14:38 1999 +++ linux/drivers/scsi/sr_ioctl.c Tue Sep 7 21:20:50 1999 @@ -293,16 +293,14 @@ int sr_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void* arg) { u_char sr_cmd[10]; - int result, target; - - target = MINOR(cdi->dev); + int result, target = MINOR(cdi->dev); + unsigned char buffer[32]; switch (cmd) { case CDROMREADTOCHDR: { struct cdrom_tochdr* tochdr = (struct cdrom_tochdr*)arg; - char buffer[32]; sr_cmd[0] = GPCMD_READ_TOC_PMA_ATIP; sr_cmd[1] = ((scsi_CDs[target].device->lun) << 5); @@ -323,7 +321,6 @@ case CDROMREADTOCENTRY: { struct cdrom_tocentry* tocentry = (struct cdrom_tocentry*)arg; - unsigned char buffer[32]; sr_cmd[0] = GPCMD_READ_TOC_PMA_ATIP; sr_cmd[1] = ((scsi_CDs[target].device->lun) << 5) | diff -ur --exclude-from /home/axboe/cdrom/exclude-from /tmp/linux-2.3.18/include/linux/cdrom.h linux/include/linux/cdrom.h --- /tmp/linux-2.3.18/include/linux/cdrom.h Sun Sep 26 21:14:42 1999 +++ linux/include/linux/cdrom.h Sun Sep 26 19:11:13 1999 @@ -147,9 +147,9 @@ /* Address in MSF format */ struct cdrom_msf0 { - u_char minute; - u_char second; - u_char frame; + __u8 minute; + __u8 second; + __u8 frame; }; /* Address in either MSF or logical format */ @@ -162,48 +162,48 @@ /* This struct is used by the CDROMPLAYMSF ioctl */ struct cdrom_msf { - u_char cdmsf_min0; /* start minute */ - u_char cdmsf_sec0; /* start second */ - u_char cdmsf_frame0; /* start frame */ - u_char cdmsf_min1; /* end minute */ - u_char cdmsf_sec1; /* end second */ - u_char cdmsf_frame1; /* end frame */ + __u8 cdmsf_min0; /* start minute */ + __u8 cdmsf_sec0; /* start second */ + __u8 cdmsf_frame0; /* start frame */ + __u8 cdmsf_min1; /* end minute */ + __u8 cdmsf_sec1; /* end second */ + __u8 cdmsf_frame1; /* end frame */ }; /* This struct is used by the CDROMPLAYTRKIND ioctl */ struct cdrom_ti { - u_char cdti_trk0; /* start track */ - u_char cdti_ind0; /* start index */ - u_char cdti_trk1; /* end track */ - u_char cdti_ind1; /* end index */ + __u8 cdti_trk0; /* start track */ + __u8 cdti_ind0; /* start index */ + __u8 cdti_trk1; /* end track */ + __u8 cdti_ind1; /* end index */ }; /* This struct is used by the CDROMREADTOCHDR ioctl */ struct cdrom_tochdr { - u_char cdth_trk0; /* start track */ - u_char cdth_trk1; /* end track */ + __u8 cdth_trk0; /* start track */ + __u8 cdth_trk1; /* end track */ }; /* This struct is used by the CDROMVOLCTRL and CDROMVOLREAD ioctls */ struct cdrom_volctrl { - u_char channel0; - u_char channel1; - u_char channel2; - u_char channel3; + __u8 channel0; + __u8 channel1; + __u8 channel2; + __u8 channel3; }; /* This struct is used by the CDROMSUBCHNL ioctl */ struct cdrom_subchnl { - u_char cdsc_format; - u_char cdsc_audiostatus; - u_char cdsc_adr: 4; - u_char cdsc_ctrl: 4; - u_char cdsc_trk; - u_char cdsc_ind; + __u8 cdsc_format; + __u8 cdsc_audiostatus; + __u8 cdsc_adr: 4; + __u8 cdsc_ctrl: 4; + __u8 cdsc_trk; + __u8 cdsc_ind; union cdrom_addr cdsc_absaddr; union cdrom_addr cdsc_reladdr; }; @@ -212,12 +212,12 @@ /* This struct is used by the CDROMREADTOCENTRY ioctl */ struct cdrom_tocentry { - u_char cdte_track; - u_char cdte_adr :4; - u_char cdte_ctrl :4; - u_char cdte_format; + __u8 cdte_track; + __u8 cdte_adr :4; + __u8 cdte_ctrl :4; + __u8 cdte_format; union cdrom_addr cdte_addr; - u_char cdte_datamode; + __u8 cdte_datamode; }; /* This struct is used by the CDROMREADMODE1, and CDROMREADMODE2 ioctls */ @@ -232,9 +232,9 @@ struct cdrom_read_audio { union cdrom_addr addr; /* frame address */ - u_char addr_format; /* CDROM_LBA or CDROM_MSF */ + __u8 addr_format; /* CDROM_LBA or CDROM_MSF */ int nframes; /* number of 2352-byte-frames to read at once */ - u_char *buf; /* frame buffer (size: nframes*2352 bytes) */ + __u8 *buf; /* frame buffer (size: nframes*2352 bytes) */ }; /* This struct is used with the CDROMMULTISESSION ioctl */ @@ -243,8 +243,8 @@ union cdrom_addr addr; /* frame address: start-of-last-session (not the new "frame 16"!). Only valid if the "xa_flag" is true. */ - u_char xa_flag; /* 1: "is XA disk" */ - u_char addr_format; /* CDROM_LBA or CDROM_MSF */ + __u8 xa_flag; /* 1: "is XA disk" */ + __u8 addr_format; /* CDROM_LBA or CDROM_MSF */ }; /* This struct is used with the CDROM_GET_MCN ioctl. @@ -254,7 +254,7 @@ */ struct cdrom_mcn { - u_char medium_catalog_number[14]; /* 13 ASCII digits, null-terminated */ + __u8 medium_catalog_number[14]; /* 13 ASCII digits, null-terminated */ }; /* This is used by the CDROMPLAYBLK ioctl */ @@ -400,6 +400,14 @@ #define CDSL_NONE ((int) (~0U>>1)-1) #define CDSL_CURRENT ((int) (~0U>>1)) +/* For partition based multisession access. IDE can handle 64 partitions + * per drive - SCSI CD-ROM's use minors to differentiate between the + * various drives, so we can't do multisessions the same way there. + * Use the -o session=x option to mount on them. + */ +#define CD_PART_MAX 64 +#define CD_PART_MASK (CD_PART_MAX - 1) + /********************************************************************* * Generic Packet commands, MMC commands, and such *********************************************************************/ @@ -495,59 +503,59 @@ #define DVD_STRUCT_MANUFACT 0x04 struct dvd_layer { - u_char book_version : 4; - u_char book_type : 4; - u_char min_rate : 4; - u_char disc_size : 4; - u_char layer_type : 4; - u_char track_path : 1; - u_char nlayers : 2; - u_char track_density : 4; - u_char linear_density : 4; - u_char bca : 1; - u_char start_sector; - u_char end_sector; - u_char end_sector_l0; + __u8 book_version : 4; + __u8 book_type : 4; + __u8 min_rate : 4; + __u8 disc_size : 4; + __u8 layer_type : 4; + __u8 track_path : 1; + __u8 nlayers : 2; + __u8 track_density : 4; + __u8 linear_density : 4; + __u8 bca : 1; + __u8 start_sector; + __u8 end_sector; + __u8 end_sector_l0; }; struct dvd_physical { - u_char type; - u_char layer_num; + __u8 type; + __u8 layer_num; struct dvd_layer layer[4]; }; struct dvd_copyright { - u_char type; + __u8 type; - u_char layer_num; - u_char cpst; - u_char rmi; + __u8 layer_num; + __u8 cpst; + __u8 rmi; }; struct dvd_disckey { - u_char type; + __u8 type; unsigned agid : 2; - u_char value[2048]; + __u8 value[2048]; }; struct dvd_bca { - u_char type; + __u8 type; int len; - u_char value[188]; + __u8 value[188]; }; struct dvd_manufact { - u_char type; + __u8 type; - u_char layer_num; + __u8 layer_num; int len; - u_char value[2048]; + __u8 value[2048]; }; typedef union { - u_char type; + __u8 type; struct dvd_physical physical; struct dvd_copyright copyright; @@ -577,30 +585,30 @@ #define DVD_INVALIDATE_AGID 9 /* State data */ -typedef u_char dvd_key[5]; /* 40-bit value, MSB is first elem. */ -typedef u_char dvd_challenge[10]; /* 80-bit value, MSB is first elem. */ +typedef __u8 dvd_key[5]; /* 40-bit value, MSB is first elem. */ +typedef __u8 dvd_challenge[10]; /* 80-bit value, MSB is first elem. */ struct dvd_lu_send_agid { - u_char type; + __u8 type; unsigned agid : 2; }; struct dvd_host_send_challenge { - u_char type; + __u8 type; unsigned agid : 2; dvd_challenge chal; }; struct dvd_send_key { - u_char type; + __u8 type; unsigned agid : 2; dvd_key key; }; struct dvd_lu_send_challenge { - u_char type; + __u8 type; unsigned agid : 2; dvd_challenge chal; @@ -617,7 +625,7 @@ #define DVD_CGMS_RESTRICTED 3 struct dvd_lu_send_title_key { - u_char type; + __u8 type; unsigned agid : 2; dvd_key title_key; @@ -628,14 +636,14 @@ }; struct dvd_lu_send_asf { - u_char type; + __u8 type; unsigned agid : 2; unsigned asf : 1; }; typedef union { - u_char type; + __u8 type; struct dvd_lu_send_agid lsa; struct dvd_host_send_challenge hsc; @@ -658,11 +666,15 @@ int speed; /* maximum speed for reading data */ int capacity; /* number of discs in jukebox */ /* device-related storage */ - int options : 30; /* options flags */ - unsigned mc_flags : 2; /* media change buffer flags */ + int options : 30; /* options flags */ + unsigned mc_flags : 2; /* media change buffer flags */ int use_count; /* number of times device opened */ char name[20]; /* name of the device type */ - +/* per-device flags */ + __u8 sanyo_slot : 2; /* Sanyo 3 CD changer support */ + __u8 reserved : 6; /* not used yet */ + __u32 packet_size; /* write out this number of packets */ + __u32 nwa; /* next writeable address */ }; struct cdrom_device_ops { @@ -699,6 +711,7 @@ extern int register_cdrom(struct cdrom_device_info *cdi); extern int unregister_cdrom(struct cdrom_device_info *cdi); + typedef struct { int data; int audio; @@ -706,9 +719,19 @@ int xa; long error; } tracktype; + extern void cdrom_count_tracks(struct cdrom_device_info *cdi,tracktype* tracks); extern int cdrom_get_next_writable(kdev_t dev, long *next_writable); extern int cdrom_get_last_written(kdev_t dev, long *last_written); +extern int cdrom_number_of_slots(struct cdrom_device_info *cdi); +extern int cdrom_select_disc(struct cdrom_device_info *cdi, int slot); +extern int cdrom_mode_select(struct cdrom_device_info *cdi, + struct cdrom_generic_command *cgc); +extern int cdrom_mode_sense(struct cdrom_device_info *cdi, + struct cdrom_generic_command *cgc, + int page_code, int page_control); +extern void init_cdrom_command(struct cdrom_generic_command *cgc, + void *buffer, int len); typedef struct { __u16 disc_information_length; @@ -739,8 +762,6 @@ __u8 uru : 1; __u8 dbc_v : 1; __u8 did_v : 1; -#else -#error "Please fix " #endif __u8 disc_type; __u8 n_sessions_msb; @@ -785,8 +806,6 @@ __u8 nwa_v : 1; __u8 lra_v : 1; __u8 reserved3 : 6; -#else -#error "Please fix " #endif __u32 track_start; __u32 next_writable; @@ -795,6 +814,121 @@ __u32 track_size; __u32 last_rec_address; } track_information; + +/* The SCSI spec says there could be 256 slots. */ +#define CDROM_MAX_SLOTS 256 + +struct cdrom_mechstat_header { +#if defined(__BIG_ENDIAN_BITFIELD) + __u8 fault : 1; + __u8 changer_state : 2; + __u8 curslot : 5; + __u8 mech_state : 3; + __u8 door_open : 1; + __u8 reserved1 : 4; +#elif defined(__LITTLE_ENDIAN_BITFIELD) + __u8 curslot : 5; + __u8 changer_state : 2; + __u8 fault : 1; + __u8 reserved1 : 4; + __u8 door_open : 1; + __u8 mech_state : 3; +#endif + __u8 curlba[3]; + __u8 nslots; + __u8 short slot_tablelen; +}; + +struct cdrom_slot { +#if defined(__BIG_ENDIAN_BITFIELD) + __u8 disc_present : 1; + __u8 reserved1 : 6; + __u8 change : 1; +#elif defined(__LITTLE_ENDIAN_BITFIELD) + __u8 change : 1; + __u8 reserved1 : 6; + __u8 disc_present : 1; +#endif + __u8 reserved2[3]; +}; + +struct cdrom_changer_info { + struct cdrom_mechstat_header hdr; + struct cdrom_slot slots[CDROM_MAX_SLOTS]; +}; + +typedef enum { + mechtype_caddy = 0, + mechtype_tray = 1, + mechtype_popup = 2, + mechtype_individual_changer = 4, + mechtype_cartridge_changer = 5 +} mechtype_t; + +struct mode_page_header { + __u16 mode_data_length; + __u8 medium_type; + __u8 reserved1; + __u8 reserved2; + __u8 reserved3; + __u16 desc_length; +}; + +typedef struct { + struct mode_page_header header; +#if defined(__BIG_ENDIAN_BITFIELD) + __u8 ps : 1; + __u8 reserved1 : 1; + __u8 page_code : 6; + __u8 page_length; + __u8 reserved2 : 1; + __u8 bufe : 1; + __u8 ls_v : 1; + __u8 test_write : 1; + __u8 write_type : 4; + __u8 multi_session : 2; /* or border, DVD */ + __u8 fp : 1; + __u8 copy : 1; + __u8 track_mode : 4; + __u8 reserved3 : 4; + __u8 data_block_type : 4; +#elif defined(__LITTLE_ENDIAN_BITFIELD) + __u8 page_code : 6; + __u8 reserved1 : 1; + __u8 ps : 1; + __u8 page_length; + __u8 write_type : 4; + __u8 test_write : 1; + __u8 ls_v : 1; + __u8 bufe : 1; + __u8 reserved2 : 1; + __u8 track_mode : 4; + __u8 copy : 1; + __u8 fp : 1; + __u8 multi_session : 2; /* or border, DVD */ + __u8 data_block_type : 4; + __u8 reserved3 : 4; +#endif + __u8 link_size; + __u8 reserved4; +#if defined(__BIG_ENDIAN_BITFIELD) + __u8 reserved5 : 2; + __u8 app_code : 6; +#elif defined(__LITTLE_ENDIAN_BITFIELD) + __u8 app_code : 6; + __u8 reserved5 : 2; +#endif + __u8 session_format; + __u8 reserved6; + __u32 packet_size; + __u16 audio_pause; + __u8 mcn[16]; + __u8 isrc[16]; + __u8 subhdr0; + __u8 subhdr1; + __u8 subhdr2; + __u8 subhdr3; +} write_param_page __attribute__((packed)); #endif /* End of kernel only stuff */ diff -ur --exclude-from /home/axboe/cdrom/exclude-from /tmp/linux-2.3.18/include/linux/ide.h linux/include/linux/ide.h --- /tmp/linux-2.3.18/include/linux/ide.h Sun Sep 26 21:14:42 1999 +++ linux/include/linux/ide.h Sun Sep 26 21:14:07 1999 @@ -239,6 +239,7 @@ unsigned long sleep; /* sleep until this time */ unsigned long service_start; /* time we started last request */ unsigned long service_time; /* service time of last request */ + unsigned long timeout; /* max time to wait for irq */ special_t special; /* special action flags */ byte keep_settings; /* restore settings after drive reset */ byte using_dma; /* disk is using dma for read/write */ @@ -585,7 +586,7 @@ * This is used on exit from the driver, to designate the next irq handler * and also to start the safety timer. */ -void ide_set_handler (ide_drive_t *drive, ide_handler_t *handler, unsigned int timeout); +void ide_set_handler (ide_drive_t *drive, ide_handler_t *handler); /* * Error reporting, in human readable form (luxurious, but a memory hog). Only in linux/net/irda: irlpt Only in linux/: smp-2.3.18-B1