Skip to content

L
linux
Commit 0037ab50 authored by Jens Axboe's avatar Jens Axboe
Browse files
Options

ide-floppy updates: 

o byte -> u8
o remove various status register definitions, these are now ata (atapi)
  generic
o ide-iops changes
o remove idefloppy_end_request(), dupe of ide core helper
o driver->end_request changes
o lots of style cleanups
o update to new dma interface
o ->reinit to ->attach updates
parent 0c5c55d1
Hide whitespace changes
Inline Side-by-side
Showing with 453 additions and 552 deletions
drivers/ide/ide-floppy.c
View file @ 0037ab50
...@@ -153,10 +153,10 @@ typedef struct idefloppy_packet_command_s { ...@@ -153,10 +153,10 @@ typedef struct idefloppy_packet_command_s {
char *b_data; /* Pointer which runs on the buffers */ char *b_data; /* Pointer which runs on the buffers */
int b_count; /* Missing/Available data on the current buffer */ int b_count; /* Missing/Available data on the current buffer */
struct request *rq; /* The corresponding request */ struct request *rq; /* The corresponding request */
byte *buffer; /* Data buffer */ u8 *buffer; /* Data buffer */
byte *current_position; /* Pointer into the above buffer */ u8 *current_position; /* Pointer into the above buffer */
void (*callback) (ide_drive_t *); /* Called when this packet command is completed */ void (*callback) (ide_drive_t *); /* Called when this packet command is completed */
byte pc_buffer[IDEFLOPPY_PC_BUFFER_SIZE]; /* Temporary buffer */ u8 pc_buffer[IDEFLOPPY_PC_BUFFER_SIZE]; /* Temporary buffer */
unsigned long flags; /* Status/Action bit flags: long for set_bit */ unsigned long flags; /* Status/Action bit flags: long for set_bit */
} idefloppy_pc_t; } idefloppy_pc_t;
...@@ -272,29 +272,41 @@ typedef struct { ...@@ -272,29 +272,41 @@ typedef struct {
typedef struct { typedef struct {
ide_drive_t *drive; ide_drive_t *drive;
idefloppy_pc_t *pc; /* Current packet command */ /* Current packet command */
idefloppy_pc_t *failed_pc; /* Last failed packet command */ idefloppy_pc_t *pc;
idefloppy_pc_t pc_stack[IDEFLOPPY_PC_STACK];/* Packet command stack */ /* Last failed packet command */
int pc_stack_index; /* Next free packet command storage space */ idefloppy_pc_t *failed_pc;
/* Packet command stack */
idefloppy_pc_t pc_stack[IDEFLOPPY_PC_STACK];
/* Next free packet command storage space */
int pc_stack_index;
struct request rq_stack[IDEFLOPPY_PC_STACK]; struct request rq_stack[IDEFLOPPY_PC_STACK];
int rq_stack_index; /* We implement a circular array */ /* We implement a circular array */
int rq_stack_index;
/* /*
* Last error information * Last error information
*/ */
byte sense_key, asc, ascq; u8 sense_key, asc, ascq;
byte ticks; /* delay this long before sending packet command */ /* delay this long before sending packet command */
u8 ticks;
int progress_indication; int progress_indication;
/* /*
* Device information * Device information
*/ */
int blocks, block_size, bs_factor; /* Current format */ /* Current format */
idefloppy_capacity_descriptor_t capacity; /* Last format capacity */ int blocks, block_size, bs_factor;
idefloppy_flexible_disk_page_t flexible_disk_page; /* Copy of the flexible disk page */ /* Last format capacity */
int wp; /* Write protect */ idefloppy_capacity_descriptor_t capacity;
int srfp; /* Supports format progress report */ /* Copy of the flexible disk page */
unsigned long flags; /* Status/Action flags */ idefloppy_flexible_disk_page_t flexible_disk_page;
/* Write protect */
int wp;
/* Supports format progress report */
int srfp;
/* Status/Action flags */
unsigned long flags;
} idefloppy_floppy_t; } idefloppy_floppy_t;
#define IDEFLOPPY_TICKS_DELAY 3 /* default delay for ZIP 100 */ #define IDEFLOPPY_TICKS_DELAY 3 /* default delay for ZIP 100 */
...@@ -350,20 +362,20 @@ typedef struct { ...@@ -350,20 +362,20 @@ typedef struct {
/* /*
* Special requests for our block device strategy routine. * Special requests for our block device strategy routine.
*/ */
#define IDEFLOPPY_FIRST_RQ 90 #define IDEFLOPPY_FIRST_RQ 90
/* /*
* IDEFLOPPY_PC_RQ is used to queue a packet command in the request queue. * IDEFLOPPY_PC_RQ is used to queue a packet command in the request queue.
*/ */
#define IDEFLOPPY_PC_RQ 90 #define IDEFLOPPY_PC_RQ 90
#define IDEFLOPPY_LAST_RQ 90 #define IDEFLOPPY_LAST_RQ 90
/* /*
* A macro which can be used to check if a given request command * A macro which can be used to check if a given request command
* originated in the driver or in the buffer cache layer. * originated in the driver or in the buffer cache layer.
*/ */
#define IDEFLOPPY_RQ_CMD(cmd) ((cmd >= IDEFLOPPY_FIRST_RQ) && (cmd <= IDEFLOPPY_LAST_RQ)) #define IDEFLOPPY_RQ_CMD(cmd) ((cmd >= IDEFLOPPY_FIRST_RQ) && (cmd <= IDEFLOPPY_LAST_RQ))
#endif #endif
...@@ -373,170 +385,6 @@ typedef struct { ...@@ -373,170 +385,6 @@ typedef struct {
*/ */
#define IDEFLOPPY_ERROR_GENERAL 101 #define IDEFLOPPY_ERROR_GENERAL 101
/*
* The ATAPI Status Register.
*/
typedef union {
unsigned all :8;
struct {
#if defined(__LITTLE_ENDIAN_BITFIELD)
unsigned check :1; /* Error occurred */
unsigned idx :1; /* Reserved */
unsigned corr :1; /* Correctable error occurred */
unsigned drq :1; /* Data is request by the device */
unsigned dsc :1; /* Media access command finished */
unsigned reserved5 :1; /* Reserved */
unsigned drdy :1; /* Ignored for ATAPI commands (ready to accept ATA command) */
unsigned bsy :1; /* The device has access to the command block */
#elif defined(__BIG_ENDIAN_BITFIELD)
unsigned bsy :1; /* The device has access to the command block */
unsigned drdy :1; /* Ignored for ATAPI commands (ready to accept ATA command) */
unsigned reserved5 :1; /* Reserved */
unsigned dsc :1; /* Media access command finished */
unsigned drq :1; /* Data is request by the device */
unsigned corr :1; /* Correctable error occurred */
unsigned idx :1; /* Reserved */
unsigned check :1; /* Error occurred */
#else
#error "Bitfield endianness not defined! Check your byteorder.h"
#endif
} b;
} idefloppy_status_reg_t;
/*
* The ATAPI error register.
*/
typedef union {
unsigned all :8;
struct {
#if defined(__LITTLE_ENDIAN_BITFIELD)
unsigned ili :1; /* Illegal Length Indication */
unsigned eom :1; /* End Of Media Detected */
unsigned abrt :1; /* Aborted command - As defined by ATA */
unsigned mcr :1; /* Media Change Requested - As defined by ATA */
unsigned sense_key :4; /* Sense key of the last failed packet command */
#elif defined(__BIG_ENDIAN_BITFIELD)
unsigned sense_key :4; /* Sense key of the last failed packet command */
unsigned mcr :1; /* Media Change Requested - As defined by ATA */
unsigned abrt :1; /* Aborted command - As defined by ATA */
unsigned eom :1; /* End Of Media Detected */
unsigned ili :1; /* Illegal Length Indication */
#else
#error "Bitfield endianness not defined! Check your byteorder.h"
#endif
} b;
} idefloppy_error_reg_t;
/*
* ATAPI Feature Register
*/
typedef union {
unsigned all :8;
struct {
#if defined(__LITTLE_ENDIAN_BITFIELD)
unsigned dma :1; /* Using DMA or PIO */
unsigned reserved321 :3; /* Reserved */
unsigned reserved654 :3; /* Reserved (Tag Type) */
unsigned reserved7 :1; /* Reserved */
#elif defined(__BIG_ENDIAN_BITFIELD)
unsigned reserved7 :1; /* Reserved */
unsigned reserved654 :3; /* Reserved (Tag Type) */
unsigned reserved321 :3; /* Reserved */
unsigned dma :1; /* Using DMA or PIO */
#else
#error "Bitfield endianness not defined! Check your byteorder.h"
#endif
} b;
} idefloppy_feature_reg_t;
/*
* ATAPI Byte Count Register.
*/
typedef union {
unsigned all :16;
struct {
#if defined(__LITTLE_ENDIAN_BITFIELD)
unsigned low :8; /* LSB */
unsigned high :8; /* MSB */
#elif defined(__BIG_ENDIAN_BITFIELD)
unsigned high :8; /* MSB */
unsigned low :8; /* LSB */
#else
#error "Bitfield endianness not defined! Check your byteorder.h"
#endif
} b;
} idefloppy_bcount_reg_t;
/*
* ATAPI Interrupt Reason Register.
*/
typedef union {
unsigned all :8;
struct {
#if defined(__LITTLE_ENDIAN_BITFIELD)
unsigned cod :1; /* Information transferred is command (1) or data (0) */
unsigned io :1; /* The device requests us to read (1) or write (0) */
unsigned reserved :6; /* Reserved */
#elif defined(__BIG_ENDIAN_BITFIELD)
unsigned reserved :6; /* Reserved */
unsigned io :1; /* The device requests us to read (1) or write (0) */
unsigned cod :1; /* Information transferred is command (1) or data (0) */
#else
#error "Bitfield endianness not defined! Check your byteorder.h"
#endif
} b;
} idefloppy_ireason_reg_t;
/*
* ATAPI floppy Drive Select Register
*/
typedef union {
unsigned all :8;
struct {
#if defined(__LITTLE_ENDIAN_BITFIELD)
unsigned sam_lun :3; /* Logical unit number */
unsigned reserved3 :1; /* Reserved */
unsigned drv :1; /* The responding drive will be drive 0 (0) or drive 1 (1) */
unsigned one5 :1; /* Should be set to 1 */
unsigned reserved6 :1; /* Reserved */
unsigned one7 :1; /* Should be set to 1 */
#elif defined(__BIG_ENDIAN_BITFIELD)
unsigned one7 :1; /* Should be set to 1 */
unsigned reserved6 :1; /* Reserved */
unsigned one5 :1; /* Should be set to 1 */
unsigned drv :1; /* The responding drive will be drive 0 (0) or drive 1 (1) */
unsigned reserved3 :1; /* Reserved */
unsigned sam_lun :3; /* Logical unit number */
#else
#error "Bitfield endianness not defined! Check your byteorder.h"
#endif
} b;
} idefloppy_drivesel_reg_t;
/*
* ATAPI Device Control Register
*/
typedef union {
unsigned all :8;
struct {
#if defined(__LITTLE_ENDIAN_BITFIELD)
unsigned zero0 :1; /* Should be set to zero */
unsigned nien :1; /* Device interrupt is disabled (1) or enabled (0) */
unsigned srst :1; /* ATA software reset. ATAPI devices should use the new ATAPI srst. */
unsigned one3 :1; /* Should be set to 1 */
unsigned reserved4567 :4; /* Reserved */
#elif defined(__BIG_ENDIAN_BITFIELD)
unsigned reserved4567 :4; /* Reserved */
unsigned one3 :1; /* Should be set to 1 */
unsigned srst :1; /* ATA software reset. ATAPI devices should use the new ATAPI srst. */
unsigned nien :1; /* Device interrupt is disabled (1) or enabled (0) */
unsigned zero0 :1; /* Should be set to zero */
#else
#error "Bitfield endianness not defined! Check your byteorder.h"
#endif
} b;
} idefloppy_control_reg_t;
/* /*
* The following is used to format the general configuration word of * The following is used to format the general configuration word of
* the ATAPI IDENTIFY DEVICE command. * the ATAPI IDENTIFY DEVICE command.
...@@ -671,63 +519,32 @@ typedef struct { ...@@ -671,63 +519,32 @@ typedef struct {
static void idefloppy_discard_data (ide_drive_t *drive, unsigned int bcount) static void idefloppy_discard_data (ide_drive_t *drive, unsigned int bcount)
{ {
while (bcount--) while (bcount--)
IN_BYTE(IDE_DATA_REG); (void) HWIF(drive)->INB(IDE_DATA_REG);
} }
#if IDEFLOPPY_DEBUG_BUGS #if IDEFLOPPY_DEBUG_BUGS
static void idefloppy_write_zeros (ide_drive_t *drive, unsigned int bcount) static void idefloppy_write_zeros (ide_drive_t *drive, unsigned int bcount)
{ {
while (bcount--) while (bcount--)
OUT_BYTE(0, IDE_DATA_REG); HWIF(drive)->OUTB(0, IDE_DATA_REG);
} }
#endif /* IDEFLOPPY_DEBUG_BUGS */ #endif /* IDEFLOPPY_DEBUG_BUGS */
static int idefloppy_end_request (ide_drive_t *drive, int uptodate)
{
struct request *rq;
unsigned long flags;
int ret = 1;
spin_lock_irqsave(&ide_lock, flags);
rq = HWGROUP(drive)->rq;
BUG_ON(!(rq->flags & REQ_STARTED));
/*
* decide whether to reenable DMA -- 3 is a random magic for now,
* if we DMA timeout more than 3 times, just stay in PIO
*/
if (drive->state == DMA_PIO_RETRY && drive->retry_pio <= 3) {
drive->state = 0;
HWGROUP(drive)->hwif->dmaproc(ide_dma_on, drive);
}
if (!end_that_request_first(rq, uptodate, rq->hard_cur_sectors)) {
add_blkdev_randomness(major(rq->rq_dev));
blkdev_dequeue_request(rq);
HWGROUP(drive)->rq = NULL;
end_that_request_last(rq);
ret = 0;
}
spin_unlock_irqrestore(&ide_lock, flags);
return ret;
}
/* /*
* idefloppy_do_end_request is used to finish servicing a request. * idefloppy_do_end_request is used to finish servicing a request.
* *
* For read/write requests, we will call ide_end_request to pass to the * For read/write requests, we will call ide_end_request to pass to the
* next buffer. * next buffer.
*/ */
static int idefloppy_do_end_request (ide_drive_t *drive, int uptodate) static int idefloppy_do_end_request(ide_drive_t *drive, int uptodate, int nsecs)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
struct request *rq = HWGROUP(drive)->rq; struct request *rq = HWGROUP(drive)->rq;
int error; int error;
#if IDEFLOPPY_DEBUG_LOG #if IDEFLOPPY_DEBUG_LOG
printk (KERN_INFO "Reached idefloppy_end_request\n"); printk(KERN_INFO "Reached idefloppy_end_request\n");
#endif /* IDEFLOPPY_DEBUG_LOG */ #endif /* IDEFLOPPY_DEBUG_LOG */
switch (uptodate) { switch (uptodate) {
...@@ -742,12 +559,12 @@ static int idefloppy_do_end_request (ide_drive_t *drive, int uptodate) ...@@ -742,12 +559,12 @@ static int idefloppy_do_end_request (ide_drive_t *drive, int uptodate)
return 0; return 0;
if (!(rq->flags & REQ_SPECIAL)) { //if (!IDEFLOPPY_RQ_CMD (rq->cmd)) { if (!(rq->flags & REQ_SPECIAL)) { //if (!IDEFLOPPY_RQ_CMD (rq->cmd)) {
/* our real local end request function */ /* our real local end request function */
idefloppy_end_request(drive, uptodate); ide_end_request(drive, uptodate, nsecs);
return 0; return 0;
} }
rq->errors = error; rq->errors = error;
/* fixme: need to move this local also */ /* fixme: need to move this local also */
ide_end_drive_cmd (drive, 0, 0); ide_end_drive_cmd(drive, 0, 0);
return 0; return 0;
} }
...@@ -761,18 +578,21 @@ static void idefloppy_input_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, uns ...@@ -761,18 +578,21 @@ static void idefloppy_input_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, uns
if (pc->b_count == bio->bi_size) { if (pc->b_count == bio->bi_size) {
rq->sector += rq->current_nr_sectors; rq->sector += rq->current_nr_sectors;
rq->nr_sectors -= rq->current_nr_sectors; rq->nr_sectors -= rq->current_nr_sectors;
idefloppy_do_end_request(drive, 1); idefloppy_do_end_request(drive, 1, 0);
if ((bio = rq->bio) != NULL) if ((bio = rq->bio) != NULL)
pc->b_count = 0; pc->b_count = 0;
} }
if (bio == NULL) { if (bio == NULL) {
printk (KERN_ERR "%s: bio == NULL in idefloppy_input_buffers, bcount == %d\n", drive->name, bcount); printk(KERN_ERR "%s: bio == NULL in "
"idefloppy_input_buffers, bcount == %d\n",
drive->name, bcount);
idefloppy_discard_data(drive, bcount); idefloppy_discard_data(drive, bcount);
return; return;
} }
count = IDEFLOPPY_MIN(bio->bi_size - pc->b_count, bcount); count = IDEFLOPPY_MIN(bio->bi_size - pc->b_count, bcount);
atapi_input_bytes(drive, bio_data(bio) + pc->b_count, count); atapi_input_bytes(drive, bio_data(bio) + pc->b_count, count);
bcount -= count; pc->b_count += count; bcount -= count;
pc->b_count += count;
} }
} }
...@@ -786,20 +606,24 @@ static void idefloppy_output_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, un ...@@ -786,20 +606,24 @@ static void idefloppy_output_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, un
if (!pc->b_count) { if (!pc->b_count) {
rq->sector += rq->current_nr_sectors; rq->sector += rq->current_nr_sectors;
rq->nr_sectors -= rq->current_nr_sectors; rq->nr_sectors -= rq->current_nr_sectors;
idefloppy_do_end_request(drive, 1); idefloppy_do_end_request(drive, 1, 0);
if ((bio = rq->bio) != NULL) { if ((bio = rq->bio) != NULL) {
pc->b_data = bio_data(bio); pc->b_data = bio_data(bio);
pc->b_count = bio->bi_size; pc->b_count = bio->bi_size;
} }
} }
if (bio == NULL) { if (bio == NULL) {
printk (KERN_ERR "%s: bio == NULL in idefloppy_output_buffers, bcount == %d\n", drive->name, bcount); printk(KERN_ERR "%s: bio == NULL in "
idefloppy_write_zeros (drive, bcount); "idefloppy_output_buffers, bcount == %d\n",
drive->name, bcount);
idefloppy_write_zeros(drive, bcount);
return; return;
} }
count = IDEFLOPPY_MIN (pc->b_count, bcount); count = IDEFLOPPY_MIN(pc->b_count, bcount);
atapi_output_bytes (drive, pc->b_data, count); atapi_output_bytes(drive, pc->b_data, count);
bcount -= count; pc->b_data += count; pc->b_count -= count; bcount -= count;
pc->b_data += count;
pc->b_count -= count;
} }
} }
...@@ -810,7 +634,7 @@ static void idefloppy_update_buffers (ide_drive_t *drive, idefloppy_pc_t *pc) ...@@ -810,7 +634,7 @@ static void idefloppy_update_buffers (ide_drive_t *drive, idefloppy_pc_t *pc)
struct bio *bio = rq->bio; struct bio *bio = rq->bio;
while ((bio = rq->bio) != NULL) while ((bio = rq->bio) != NULL)
idefloppy_do_end_request(drive, 1); idefloppy_do_end_request(drive, 1, 0);
} }
#endif /* CONFIG_BLK_DEV_IDEDMA */ #endif /* CONFIG_BLK_DEV_IDEDMA */
...@@ -821,17 +645,17 @@ static void idefloppy_update_buffers (ide_drive_t *drive, idefloppy_pc_t *pc) ...@@ -821,17 +645,17 @@ static void idefloppy_update_buffers (ide_drive_t *drive, idefloppy_pc_t *pc)
*/ */
static void idefloppy_queue_pc_head (ide_drive_t *drive,idefloppy_pc_t *pc,struct request *rq) static void idefloppy_queue_pc_head (ide_drive_t *drive,idefloppy_pc_t *pc,struct request *rq)
{ {
ide_init_drive_cmd (rq); ide_init_drive_cmd(rq);
rq->buffer = (char *) pc; rq->buffer = (char *) pc;
rq->flags = REQ_SPECIAL; //rq->cmd = IDEFLOPPY_PC_RQ; rq->flags = REQ_SPECIAL; //rq->cmd = IDEFLOPPY_PC_RQ;
(void) ide_do_drive_cmd (drive, rq, ide_preempt); (void) ide_do_drive_cmd(drive, rq, ide_preempt);
} }
static idefloppy_pc_t *idefloppy_next_pc_storage (ide_drive_t *drive) static idefloppy_pc_t *idefloppy_next_pc_storage (ide_drive_t *drive)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
if (floppy->pc_stack_index==IDEFLOPPY_PC_STACK) if (floppy->pc_stack_index == IDEFLOPPY_PC_STACK)
floppy->pc_stack_index=0; floppy->pc_stack_index=0;
return (&floppy->pc_stack[floppy->pc_stack_index++]); return (&floppy->pc_stack[floppy->pc_stack_index++]);
} }
...@@ -840,8 +664,8 @@ static struct request *idefloppy_next_rq_storage (ide_drive_t *drive) ...@@ -840,8 +664,8 @@ static struct request *idefloppy_next_rq_storage (ide_drive_t *drive)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
if (floppy->rq_stack_index==IDEFLOPPY_PC_STACK) if (floppy->rq_stack_index == IDEFLOPPY_PC_STACK)
floppy->rq_stack_index=0; floppy->rq_stack_index = 0;
return (&floppy->rq_stack[floppy->rq_stack_index++]); return (&floppy->rq_stack[floppy->rq_stack_index++]);
} }
...@@ -853,14 +677,20 @@ static void idefloppy_analyze_error (ide_drive_t *drive,idefloppy_request_sense_ ...@@ -853,14 +677,20 @@ static void idefloppy_analyze_error (ide_drive_t *drive,idefloppy_request_sense_
{ {
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
floppy->sense_key = result->sense_key; floppy->asc = result->asc; floppy->ascq = result->ascq; floppy->sense_key = result->sense_key;
floppy->progress_indication= result->sksv[0] & 0x80 ? floppy->asc = result->asc;
(unsigned short)get_unaligned((u16 *)(result->sksv+1)):0x10000; floppy->ascq = result->ascq;
floppy->progress_indication = result->sksv[0] & 0x80 ?
(u16)get_unaligned((u16 *)(result->sksv+1)):0x10000;
#if IDEFLOPPY_DEBUG_LOG #if IDEFLOPPY_DEBUG_LOG
if (floppy->failed_pc) if (floppy->failed_pc)
printk (KERN_INFO "ide-floppy: pc = %x, sense key = %x, asc = %x, ascq = %x\n",floppy->failed_pc->c[0],result->sense_key,result->asc,result->ascq); printk(KERN_INFO "ide-floppy: pc = %x, sense key = %x, "
"asc = %x, ascq = %x\n", floppy->failed_pc->c[0],
result->sense_key, result->asc, result->ascq);
else else
printk (KERN_INFO "ide-floppy: sense key = %x, asc = %x, ascq = %x\n",result->sense_key,result->asc,result->ascq); printk(KERN_INFO "ide-floppy: sense key = %x, asc = %x, "
"ascq = %x\n", result->sense_key,
result->asc, result->ascq);
#endif /* IDEFLOPPY_DEBUG_LOG */ #endif /* IDEFLOPPY_DEBUG_LOG */
} }
...@@ -869,14 +699,14 @@ static void idefloppy_request_sense_callback (ide_drive_t *drive) ...@@ -869,14 +699,14 @@ static void idefloppy_request_sense_callback (ide_drive_t *drive)
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
#if IDEFLOPPY_DEBUG_LOG #if IDEFLOPPY_DEBUG_LOG
printk (KERN_INFO "ide-floppy: Reached idefloppy_request_sense_callback\n"); printk(KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__);
#endif /* IDEFLOPPY_DEBUG_LOG */ #endif /* IDEFLOPPY_DEBUG_LOG */
if (!floppy->pc->error) { if (!floppy->pc->error) {
idefloppy_analyze_error (drive,(idefloppy_request_sense_result_t *) floppy->pc->buffer); idefloppy_analyze_error(drive,(idefloppy_request_sense_result_t *) floppy->pc->buffer);
idefloppy_do_end_request(drive, 1); idefloppy_do_end_request(drive, 1, 0);
} else { } else {
printk (KERN_ERR "Error in REQUEST SENSE itself - Aborting request!\n"); printk(KERN_ERR "Error in REQUEST SENSE itself - Aborting request!\n");
idefloppy_do_end_request(drive, 0); idefloppy_do_end_request(drive, 0, 0);
} }
} }
...@@ -888,10 +718,10 @@ static void idefloppy_pc_callback (ide_drive_t *drive) ...@@ -888,10 +718,10 @@ static void idefloppy_pc_callback (ide_drive_t *drive)
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
#if IDEFLOPPY_DEBUG_LOG #if IDEFLOPPY_DEBUG_LOG
printk (KERN_INFO "ide-floppy: Reached idefloppy_pc_callback\n"); printk (KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__);
#endif /* IDEFLOPPY_DEBUG_LOG */ #endif /* IDEFLOPPY_DEBUG_LOG */
idefloppy_do_end_request(drive, floppy->pc->error ? 0 : 1); idefloppy_do_end_request(drive, floppy->pc->error ? 0 : 1, 0);
} }
/* /*
...@@ -899,7 +729,7 @@ static void idefloppy_pc_callback (ide_drive_t *drive) ...@@ -899,7 +729,7 @@ static void idefloppy_pc_callback (ide_drive_t *drive)
*/ */
static void idefloppy_init_pc (idefloppy_pc_t *pc) static void idefloppy_init_pc (idefloppy_pc_t *pc)
{ {
memset (pc->c, 0, 12); memset(pc->c, 0, 12);
pc->retries = 0; pc->retries = 0;
pc->flags = 0; pc->flags = 0;
pc->request_transfer = 0; pc->request_transfer = 0;
...@@ -912,7 +742,7 @@ static void idefloppy_init_pc (idefloppy_pc_t *pc) ...@@ -912,7 +742,7 @@ static void idefloppy_init_pc (idefloppy_pc_t *pc)
static void idefloppy_create_request_sense_cmd (idefloppy_pc_t *pc) static void idefloppy_create_request_sense_cmd (idefloppy_pc_t *pc)
{ {
idefloppy_init_pc (pc); idefloppy_init_pc(pc);
pc->c[0] = IDEFLOPPY_REQUEST_SENSE_CMD; pc->c[0] = IDEFLOPPY_REQUEST_SENSE_CMD;
pc->c[4] = 255; pc->c[4] = 255;
pc->request_transfer = 18; pc->request_transfer = 18;
...@@ -928,13 +758,13 @@ static void idefloppy_retry_pc (ide_drive_t *drive) ...@@ -928,13 +758,13 @@ static void idefloppy_retry_pc (ide_drive_t *drive)
{ {
idefloppy_pc_t *pc; idefloppy_pc_t *pc;
struct request *rq; struct request *rq;
idefloppy_error_reg_t error; atapi_error_t error;
error.all = IN_BYTE (IDE_ERROR_REG); error.all = HWIF(drive)->INB(IDE_ERROR_REG);
pc = idefloppy_next_pc_storage (drive); pc = idefloppy_next_pc_storage(drive);
rq = idefloppy_next_rq_storage (drive); rq = idefloppy_next_rq_storage(drive);
idefloppy_create_request_sense_cmd (pc); idefloppy_create_request_sense_cmd(pc);
idefloppy_queue_pc_head (drive, pc, rq); idefloppy_queue_pc_head(drive, pc, rq);
} }
/* /*
...@@ -944,24 +774,25 @@ static void idefloppy_retry_pc (ide_drive_t *drive) ...@@ -944,24 +774,25 @@ static void idefloppy_retry_pc (ide_drive_t *drive)
static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
idefloppy_status_reg_t status; atapi_status_t status;
idefloppy_bcount_reg_t bcount; atapi_bcount_t bcount;
idefloppy_ireason_reg_t ireason; atapi_ireason_t ireason;
idefloppy_pc_t *pc=floppy->pc; idefloppy_pc_t *pc = floppy->pc;
struct request *rq = pc->rq; struct request *rq = pc->rq;
unsigned int temp; unsigned int temp;
#if IDEFLOPPY_DEBUG_LOG #if IDEFLOPPY_DEBUG_LOG
printk (KERN_INFO "ide-floppy: Reached idefloppy_pc_intr interrupt handler\n"); printk(KERN_INFO "ide-floppy: Reached %s interrupt handler\n",
__FUNCTION__);
#endif /* IDEFLOPPY_DEBUG_LOG */ #endif /* IDEFLOPPY_DEBUG_LOG */
#ifdef CONFIG_BLK_DEV_IDEDMA #ifdef CONFIG_BLK_DEV_IDEDMA
if (test_bit (PC_DMA_IN_PROGRESS, &pc->flags)) { if (test_bit(PC_DMA_IN_PROGRESS, &pc->flags)) {
if (HWIF(drive)->dmaproc(ide_dma_end, drive)) { if (HWIF(drive)->ide_dma_end(drive)) {
set_bit (PC_DMA_ERROR, &pc->flags); set_bit(PC_DMA_ERROR, &pc->flags);
} else { } else {
pc->actually_transferred=pc->request_transfer; pc->actually_transferred = pc->request_transfer;
idefloppy_update_buffers (drive, pc); idefloppy_update_buffers(drive, pc);
} }
#if IDEFLOPPY_DEBUG_LOG #if IDEFLOPPY_DEBUG_LOG
printk (KERN_INFO "ide-floppy: DMA finished\n"); printk (KERN_INFO "ide-floppy: DMA finished\n");
...@@ -969,83 +800,112 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) ...@@ -969,83 +800,112 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)
} }
#endif /* CONFIG_BLK_DEV_IDEDMA */ #endif /* CONFIG_BLK_DEV_IDEDMA */
status.all = GET_STAT(); /* Clear the interrupt */ /* Clear the interrupt */
status.all = HWIF(drive)->INB(IDE_STATUS_REG);
if (!status.b.drq) { /* No more interrupts */ if (!status.b.drq) { /* No more interrupts */
#if IDEFLOPPY_DEBUG_LOG #if IDEFLOPPY_DEBUG_LOG
printk (KERN_INFO "Packet command completed, %d bytes transferred\n", pc->actually_transferred); printk(KERN_INFO "Packet command completed, %d bytes "
"transferred\n", pc->actually_transferred);
#endif /* IDEFLOPPY_DEBUG_LOG */ #endif /* IDEFLOPPY_DEBUG_LOG */
clear_bit (PC_DMA_IN_PROGRESS, &pc->flags); clear_bit(PC_DMA_IN_PROGRESS, &pc->flags);
local_irq_enable(); local_irq_enable();
if (status.b.check || test_bit (PC_DMA_ERROR, &pc->flags)) { /* Error detected */ if (status.b.check || test_bit(PC_DMA_ERROR, &pc->flags)) {
/* Error detected */
#if IDEFLOPPY_DEBUG_LOG #if IDEFLOPPY_DEBUG_LOG
printk (KERN_INFO "ide-floppy: %s: I/O error\n",drive->name); printk(KERN_INFO "ide-floppy: %s: I/O error\n",
drive->name);
#endif /* IDEFLOPPY_DEBUG_LOG */ #endif /* IDEFLOPPY_DEBUG_LOG */
rq->errors++; rq->errors++;
if (pc->c[0] == IDEFLOPPY_REQUEST_SENSE_CMD) { if (pc->c[0] == IDEFLOPPY_REQUEST_SENSE_CMD) {
printk (KERN_ERR "ide-floppy: I/O error in request sense command\n"); printk(KERN_ERR "ide-floppy: I/O error in "
return ide_do_reset (drive); "request sense command\n");
return ide_do_reset(drive);
} }
idefloppy_retry_pc (drive); /* Retry operation */ /* Retry operation */
return ide_stopped; /* queued, but not started */ idefloppy_retry_pc(drive);
/* queued, but not started */
return ide_stopped;
} }
pc->error = 0; pc->error = 0;
if (floppy->failed_pc == pc) if (floppy->failed_pc == pc)
floppy->failed_pc=NULL; floppy->failed_pc = NULL;
pc->callback(drive); /* Command finished - Call the callback function */ /* Command finished - Call the callback function */
pc->callback(drive);
return ide_stopped; return ide_stopped;
} }
#ifdef CONFIG_BLK_DEV_IDEDMA #ifdef CONFIG_BLK_DEV_IDEDMA
if (test_and_clear_bit (PC_DMA_IN_PROGRESS, &pc->flags)) { if (test_and_clear_bit(PC_DMA_IN_PROGRESS, &pc->flags)) {
printk (KERN_ERR "ide-floppy: The floppy wants to issue more interrupts in DMA mode\n"); printk(KERN_ERR "ide-floppy: The floppy wants to issue "
(void) HWIF(drive)->dmaproc(ide_dma_off, drive); "more interrupts in DMA mode\n");
return ide_do_reset (drive); (void) HWIF(drive)->ide_dma_off(drive);
return ide_do_reset(drive);
} }
#endif /* CONFIG_BLK_DEV_IDEDMA */ #endif /* CONFIG_BLK_DEV_IDEDMA */
bcount.b.high=IN_BYTE (IDE_BCOUNTH_REG); /* Get the number of bytes to transfer */ /* Get the number of bytes to transfer */
bcount.b.low=IN_BYTE (IDE_BCOUNTL_REG); /* on this interrupt */ bcount.b.high = HWIF(drive)->INB(IDE_BCOUNTH_REG);
ireason.all=IN_BYTE (IDE_IREASON_REG); bcount.b.low = HWIF(drive)->INB(IDE_BCOUNTL_REG);
/* on this interrupt */
ireason.all = HWIF(drive)->INB(IDE_IREASON_REG);
if (ireason.b.cod) { if (ireason.b.cod) {
printk (KERN_ERR "ide-floppy: CoD != 0 in idefloppy_pc_intr\n"); printk(KERN_ERR "ide-floppy: CoD != 0 in idefloppy_pc_intr\n");
return ide_do_reset (drive); return ide_do_reset(drive);
} }
if (ireason.b.io == test_bit (PC_WRITING, &pc->flags)) { /* Hopefully, we will never get here */ if (ireason.b.io == test_bit(PC_WRITING, &pc->flags)) {
printk (KERN_ERR "ide-floppy: We wanted to %s, ", ireason.b.io ? "Write":"Read"); /* Hopefully, we will never get here */
printk (KERN_ERR "but the floppy wants us to %s !\n",ireason.b.io ? "Read":"Write"); printk(KERN_ERR "ide-floppy: We wanted to %s, ",
return ide_do_reset (drive); ireason.b.io ? "Write":"Read");
printk(KERN_ERR "but the floppy wants us to %s !\n",
ireason.b.io ? "Read":"Write");
return ide_do_reset(drive);
} }
if (!test_bit (PC_WRITING, &pc->flags)) { /* Reading - Check that we have enough space */ if (!test_bit(PC_WRITING, &pc->flags)) {
/* Reading - Check that we have enough space */
temp = pc->actually_transferred + bcount.all; temp = pc->actually_transferred + bcount.all;
if ( temp > pc->request_transfer) { if (temp > pc->request_transfer) {
if (temp > pc->buffer_size) { if (temp > pc->buffer_size) {
printk (KERN_ERR "ide-floppy: The floppy wants to send us more data than expected - discarding data\n"); printk(KERN_ERR "ide-floppy: The floppy wants "
idefloppy_discard_data (drive,bcount.all); "to send us more data than expected "
"- discarding data\n");
idefloppy_discard_data(drive,bcount.all);
if (HWGROUP(drive)->handler != NULL) if (HWGROUP(drive)->handler != NULL)
BUG(); BUG();
ide_set_handler(drive, &idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD, NULL); ide_set_handler(drive,
&idefloppy_pc_intr,
IDEFLOPPY_WAIT_CMD,
NULL);
return ide_started; return ide_started;
} }
#if IDEFLOPPY_DEBUG_LOG #if IDEFLOPPY_DEBUG_LOG
printk (KERN_NOTICE "ide-floppy: The floppy wants to send us more data than expected - allowing transfer\n"); printk(KERN_NOTICE "ide-floppy: The floppy wants to "
"send us more data than expected - "
"allowing transfer\n");
#endif /* IDEFLOPPY_DEBUG_LOG */ #endif /* IDEFLOPPY_DEBUG_LOG */
} }
} }
if (test_bit (PC_WRITING, &pc->flags)) { if (test_bit(PC_WRITING, &pc->flags)) {
if (pc->buffer != NULL) if (pc->buffer != NULL)
atapi_output_bytes (drive,pc->current_position,bcount.all); /* Write the current buffer */ /* Write the current buffer */
HWIF(drive)->atapi_output_bytes(drive,
pc->current_position,
bcount.all);
else else
idefloppy_output_buffers (drive, pc, bcount.all); idefloppy_output_buffers(drive, pc, bcount.all);
} else { } else {
if (pc->buffer != NULL) if (pc->buffer != NULL)
atapi_input_bytes (drive,pc->current_position,bcount.all); /* Read the current buffer */ /* Read the current buffer */
HWIF(drive)->atapi_input_bytes(drive,
pc->current_position,
bcount.all);
else else
idefloppy_input_buffers (drive, pc, bcount.all); idefloppy_input_buffers(drive, pc, bcount.all);
} }
pc->actually_transferred+=bcount.all; /* Update the current position */ /* Update the current position */
pc->current_position+=bcount.all; pc->actually_transferred += bcount.all;
pc->current_position += bcount.all;
if (HWGROUP(drive)->handler != NULL) if (HWGROUP(drive)->handler != NULL)
BUG(); BUG();
...@@ -1062,23 +922,25 @@ static ide_startstop_t idefloppy_transfer_pc (ide_drive_t *drive) ...@@ -1062,23 +922,25 @@ static ide_startstop_t idefloppy_transfer_pc (ide_drive_t *drive)
{ {
ide_startstop_t startstop; ide_startstop_t startstop;
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
idefloppy_ireason_reg_t ireason; atapi_ireason_t ireason;
if (ide_wait_stat (&startstop,drive,DRQ_STAT,BUSY_STAT,WAIT_READY)) { if (ide_wait_stat(&startstop, drive, DRQ_STAT, BUSY_STAT, WAIT_READY)) {
printk(KERN_ERR "ide-floppy: Strange, packet command " printk(KERN_ERR "ide-floppy: Strange, packet command "
"initiated yet DRQ isn't asserted\n"); "initiated yet DRQ isn't asserted\n");
return startstop; return startstop;
} }
ireason.all = IN_BYTE(IDE_IREASON_REG); ireason.all = HWIF(drive)->INB(IDE_IREASON_REG);
if (!ireason.b.cod || ireason.b.io) { if (!ireason.b.cod || ireason.b.io) {
printk(KERN_ERR "ide-floppy: (IO,CoD) != (0,1) while " printk(KERN_ERR "ide-floppy: (IO,CoD) != (0,1) while "
"issuing a packet command\n"); "issuing a packet command\n");
return ide_do_reset (drive); return ide_do_reset(drive);
} }
if (HWGROUP(drive)->handler != NULL) if (HWGROUP(drive)->handler != NULL)
BUG(); BUG();
ide_set_handler(drive, &idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD, NULL); /* Set the interrupt routine */ /* Set the interrupt routine */
atapi_output_bytes (drive, floppy->pc->c, 12); /* Send the actual packet */ ide_set_handler(drive, &idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD, NULL);
/* Send the actual packet */
HWIF(drive)->atapi_output_bytes(drive, floppy->pc->c, 12);
return ide_started; return ide_started;
} }
...@@ -1099,33 +961,36 @@ static int idefloppy_transfer_pc2 (ide_drive_t *drive) ...@@ -1099,33 +961,36 @@ static int idefloppy_transfer_pc2 (ide_drive_t *drive)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
atapi_output_bytes(drive, floppy->pc->c, 12); /* Send the actual packet */ /* Send the actual packet */
return IDEFLOPPY_WAIT_CMD; /* Timeout for the packet command */ HWIF(drive)->atapi_output_bytes(drive, floppy->pc->c, 12);
/* Timeout for the packet command */
return IDEFLOPPY_WAIT_CMD;
} }
static ide_startstop_t idefloppy_transfer_pc1 (ide_drive_t *drive) static ide_startstop_t idefloppy_transfer_pc1 (ide_drive_t *drive)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
ide_startstop_t startstop; ide_startstop_t startstop;
idefloppy_ireason_reg_t ireason; atapi_ireason_t ireason;
if (ide_wait_stat (&startstop,drive,DRQ_STAT,BUSY_STAT,WAIT_READY)) { if (ide_wait_stat(&startstop, drive, DRQ_STAT, BUSY_STAT, WAIT_READY)) {
printk(KERN_ERR "ide-floppy: Strange, packet command " printk(KERN_ERR "ide-floppy: Strange, packet command "
"initiated yet DRQ isn't asserted\n"); "initiated yet DRQ isn't asserted\n");
return startstop; return startstop;
} }
ireason.all = IN_BYTE(IDE_IREASON_REG); ireason.all = HWIF(drive)->INB(IDE_IREASON_REG);
if (!ireason.b.cod || ireason.b.io) { if (!ireason.b.cod || ireason.b.io) {
printk(KERN_ERR "ide-floppy: (IO,CoD) != (0,1) " printk(KERN_ERR "ide-floppy: (IO,CoD) != (0,1) "
"while issuing a packet command\n"); "while issuing a packet command\n");
return ide_do_reset (drive); return ide_do_reset(drive);
} }
/* /*
* The following delay solves a problem with ATAPI Zip 100 drives where the * The following delay solves a problem with ATAPI Zip 100 drives
* Busy flag was apparently being deasserted before the unit was ready to * where the Busy flag was apparently being deasserted before the
* receive data. This was happening on a 1200 MHz Athlon system. 10/26/01 * unit was ready to receive data. This was happening on a
* 25msec is too short, 40 and 50msec work well. idefloppy_pc_intr will * 1200 MHz Athlon system. 10/26/01 25msec is too short,
* not be actually used until after the packet is moved in about 50 msec. * 40 and 50msec work well. idefloppy_pc_intr will not be actually
* used until after the packet is moved in about 50 msec.
*/ */
if (HWGROUP(drive)->handler != NULL) if (HWGROUP(drive)->handler != NULL)
BUG(); BUG();
...@@ -1142,28 +1007,32 @@ static ide_startstop_t idefloppy_transfer_pc1 (ide_drive_t *drive) ...@@ -1142,28 +1007,32 @@ static ide_startstop_t idefloppy_transfer_pc1 (ide_drive_t *drive)
static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *pc) static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *pc)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
idefloppy_bcount_reg_t bcount; atapi_feature_t feature;
int dma_ok = 0; atapi_bcount_t bcount;
ide_handler_t *pkt_xfer_routine; ide_handler_t *pkt_xfer_routine;
#if IDEFLOPPY_DEBUG_BUGS #if IDEFLOPPY_DEBUG_BUGS
if (floppy->pc->c[0] == IDEFLOPPY_REQUEST_SENSE_CMD && pc->c[0] == IDEFLOPPY_REQUEST_SENSE_CMD) { if (floppy->pc->c[0] == IDEFLOPPY_REQUEST_SENSE_CMD &&
printk (KERN_ERR "ide-floppy: possible ide-floppy.c bug - Two request sense in serial were issued\n"); pc->c[0] == IDEFLOPPY_REQUEST_SENSE_CMD) {
printk(KERN_ERR "ide-floppy: possible ide-floppy.c bug - "
"Two request sense in serial were issued\n");
} }
#endif /* IDEFLOPPY_DEBUG_BUGS */ #endif /* IDEFLOPPY_DEBUG_BUGS */
if (floppy->failed_pc == NULL && pc->c[0] != IDEFLOPPY_REQUEST_SENSE_CMD) if (floppy->failed_pc == NULL &&
floppy->failed_pc=pc; pc->c[0] != IDEFLOPPY_REQUEST_SENSE_CMD)
floppy->pc=pc; /* Set the current packet command */ floppy->failed_pc = pc;
/* Set the current packet command */
floppy->pc = pc;
if (pc->retries > IDEFLOPPY_MAX_PC_RETRIES || test_bit (PC_ABORT, &pc->flags)) { if (pc->retries > IDEFLOPPY_MAX_PC_RETRIES ||
test_bit(PC_ABORT, &pc->flags)) {
/* /*
* We will "abort" retrying a packet command in case * We will "abort" retrying a packet command in case
* a legitimate error code was received. * a legitimate error code was received.
*/ */
if (!test_bit (PC_ABORT, &pc->flags)) { if (!test_bit(PC_ABORT, &pc->flags)) {
if (!test_bit (PC_SUPPRESS_ERROR, &pc->flags)) { if (!test_bit(PC_SUPPRESS_ERROR, &pc->flags)) {
;
printk(KERN_ERR "ide-floppy: %s: I/O error, " printk(KERN_ERR "ide-floppy: %s: I/O error, "
"pc = %2x, key = %2x, " "pc = %2x, key = %2x, "
"asc = %2x, ascq = %2x\n", "asc = %2x, ascq = %2x\n",
...@@ -1174,56 +1043,73 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p ...@@ -1174,56 +1043,73 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p
/* Giving up */ /* Giving up */
pc->error = IDEFLOPPY_ERROR_GENERAL; pc->error = IDEFLOPPY_ERROR_GENERAL;
} }
floppy->failed_pc=NULL; floppy->failed_pc = NULL;
pc->callback(drive); pc->callback(drive);
return ide_stopped; return ide_stopped;
} }
#if IDEFLOPPY_DEBUG_LOG #if IDEFLOPPY_DEBUG_LOG
printk (KERN_INFO "Retry number - %d\n",pc->retries); printk(KERN_INFO "Retry number - %d\n",pc->retries);
#endif /* IDEFLOPPY_DEBUG_LOG */ #endif /* IDEFLOPPY_DEBUG_LOG */
pc->retries++; pc->retries++;
pc->actually_transferred=0; /* We haven't transferred any data yet */ /* We haven't transferred any data yet */
pc->current_position=pc->buffer; pc->actually_transferred = 0;
pc->current_position = pc->buffer;
bcount.all = min(pc->request_transfer, 63 * 1024); bcount.all = min(pc->request_transfer, 63 * 1024);
#ifdef CONFIG_BLK_DEV_IDEDMA #ifdef CONFIG_BLK_DEV_IDEDMA
if (test_and_clear_bit (PC_DMA_ERROR, &pc->flags)) { if (test_and_clear_bit(PC_DMA_ERROR, &pc->flags)) {
(void) HWIF(drive)->dmaproc(ide_dma_off, drive); (void) HWIF(drive)->ide_dma_off(drive);
}
#endif /* CONFIG_BLK_DEV_IDEDMA */
feature.all = 0;
#ifdef CONFIG_BLK_DEV_IDEDMA
if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) {
if (test_bit(PC_WRITING, &pc->flags)) {
feature.b.dma = !HWIF(drive)->ide_dma_write(drive);
} else {
feature.b.dma = !HWIF(drive)->ide_dma_read(drive);
}
} }
if (test_bit (PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma)
dma_ok=!HWIF(drive)->dmaproc(test_bit (PC_WRITING, &pc->flags) ? ide_dma_write : ide_dma_read, drive);
#endif /* CONFIG_BLK_DEV_IDEDMA */ #endif /* CONFIG_BLK_DEV_IDEDMA */
if (IDE_CONTROL_REG) if (IDE_CONTROL_REG)
OUT_BYTE(drive->ctl,IDE_CONTROL_REG); HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG);
OUT_BYTE(dma_ok ? 1:0,IDE_FEATURE_REG); /* Use PIO/DMA */ /* Use PIO/DMA */
OUT_BYTE(bcount.b.high,IDE_BCOUNTH_REG); HWIF(drive)->OUTB(feature.all, IDE_FEATURE_REG);
OUT_BYTE(bcount.b.low,IDE_BCOUNTL_REG); HWIF(drive)->OUTB(bcount.b.high, IDE_BCOUNTH_REG);
OUT_BYTE(drive->select.all,IDE_SELECT_REG); HWIF(drive)->OUTB(bcount.b.low, IDE_BCOUNTL_REG);
HWIF(drive)->OUTB(drive->select.all, IDE_SELECT_REG);
#ifdef CONFIG_BLK_DEV_IDEDMA #ifdef CONFIG_BLK_DEV_IDEDMA
if (dma_ok) { /* Begin DMA, if necessary */ if (feature.b.dma) { /* Begin DMA, if necessary */
set_bit (PC_DMA_IN_PROGRESS, &pc->flags); set_bit(PC_DMA_IN_PROGRESS, &pc->flags);
(void) (HWIF(drive)->dmaproc(ide_dma_begin, drive)); (void) (HWIF(drive)->ide_dma_begin(drive));
} }
#endif /* CONFIG_BLK_DEV_IDEDMA */ #endif /* CONFIG_BLK_DEV_IDEDMA */
/* Can we transfer the packet when we get the interrupt or wait? */ /* Can we transfer the packet when we get the interrupt or wait? */
if (test_bit (IDEFLOPPY_ZIP_DRIVE, &floppy->flags)) { if (test_bit(IDEFLOPPY_ZIP_DRIVE, &floppy->flags)) {
pkt_xfer_routine = &idefloppy_transfer_pc1; /* wait */ /* wait */
pkt_xfer_routine = &idefloppy_transfer_pc1;
} else { } else {
pkt_xfer_routine = &idefloppy_transfer_pc; /* immediate */ /* immediate */
pkt_xfer_routine = &idefloppy_transfer_pc;
} }
if (test_bit (IDEFLOPPY_DRQ_INTERRUPT, &floppy->flags)) { if (test_bit (IDEFLOPPY_DRQ_INTERRUPT, &floppy->flags)) {
if (HWGROUP(drive)->handler != NULL) if (HWGROUP(drive)->handler != NULL)
BUG(); BUG();
ide_set_handler(drive, pkt_xfer_routine, IDEFLOPPY_WAIT_CMD, NULL); ide_set_handler(drive,
OUT_BYTE(WIN_PACKETCMD, IDE_COMMAND_REG); /* Issue the packet command */ pkt_xfer_routine,
IDEFLOPPY_WAIT_CMD,
NULL);
/* Issue the packet command */
HWIF(drive)->OUTB(WIN_PACKETCMD, IDE_COMMAND_REG);
return ide_started; return ide_started;
} else { } else {
OUT_BYTE(WIN_PACKETCMD, IDE_COMMAND_REG); /* Issue the packet command */
HWIF(drive)->OUTB(WIN_PACKETCMD, IDE_COMMAND_REG);
return (*pkt_xfer_routine) (drive); return (*pkt_xfer_routine) (drive);
} }
} }
...@@ -1234,24 +1120,25 @@ static void idefloppy_rw_callback (ide_drive_t *drive) ...@@ -1234,24 +1120,25 @@ static void idefloppy_rw_callback (ide_drive_t *drive)
printk (KERN_INFO "ide-floppy: Reached idefloppy_rw_callback\n"); printk (KERN_INFO "ide-floppy: Reached idefloppy_rw_callback\n");
#endif /* IDEFLOPPY_DEBUG_LOG */ #endif /* IDEFLOPPY_DEBUG_LOG */
idefloppy_do_end_request(drive, 1); idefloppy_do_end_request(drive, 1, 0);
return; return;
} }
static void idefloppy_create_prevent_cmd (idefloppy_pc_t *pc, int prevent) static void idefloppy_create_prevent_cmd (idefloppy_pc_t *pc, int prevent)
{ {
#if IDEFLOPPY_DEBUG_LOG #if IDEFLOPPY_DEBUG_LOG
printk (KERN_INFO "ide-floppy: creating prevent removal command, prevent = %d\n", prevent); printk(KERN_INFO "ide-floppy: creating prevent removal command, "
"prevent = %d\n", prevent);
#endif /* IDEFLOPPY_DEBUG_LOG */ #endif /* IDEFLOPPY_DEBUG_LOG */
idefloppy_init_pc (pc); idefloppy_init_pc(pc);
pc->c[0] = IDEFLOPPY_PREVENT_REMOVAL_CMD; pc->c[0] = IDEFLOPPY_PREVENT_REMOVAL_CMD;
pc->c[4] = prevent; pc->c[4] = prevent;
} }
static void idefloppy_create_read_capacity_cmd (idefloppy_pc_t *pc) static void idefloppy_create_read_capacity_cmd (idefloppy_pc_t *pc)
{ {
idefloppy_init_pc (pc); idefloppy_init_pc(pc);
pc->c[0] = IDEFLOPPY_READ_CAPACITY_CMD; pc->c[0] = IDEFLOPPY_READ_CAPACITY_CMD;
pc->c[7] = 255; pc->c[7] = 255;
pc->c[8] = 255; pc->c[8] = 255;
...@@ -1261,13 +1148,13 @@ static void idefloppy_create_read_capacity_cmd (idefloppy_pc_t *pc) ...@@ -1261,13 +1148,13 @@ static void idefloppy_create_read_capacity_cmd (idefloppy_pc_t *pc)
static void idefloppy_create_format_unit_cmd (idefloppy_pc_t *pc, int b, int l, static void idefloppy_create_format_unit_cmd (idefloppy_pc_t *pc, int b, int l,
int flags) int flags)
{ {
idefloppy_init_pc (pc); idefloppy_init_pc(pc);
pc->c[0] = IDEFLOPPY_FORMAT_UNIT_CMD; pc->c[0] = IDEFLOPPY_FORMAT_UNIT_CMD;
pc->c[1] = 0x17; pc->c[1] = 0x17;
memset(pc->buffer, 0, 12); memset(pc->buffer, 0, 12);
pc->buffer[1] = 0xA2; pc->buffer[1] = 0xA2;
/* Default format list header, byte 1: FOV/DCRT/IMM bits set */ /* Default format list header, u8 1: FOV/DCRT/IMM bits set */
if (flags & 1) /* Verify bit on... */ if (flags & 1) /* Verify bit on... */
pc->buffer[1] ^= 0x20; /* ... turn off DCRT bit */ pc->buffer[1] ^= 0x20; /* ... turn off DCRT bit */
...@@ -1282,11 +1169,11 @@ static void idefloppy_create_format_unit_cmd (idefloppy_pc_t *pc, int b, int l, ...@@ -1282,11 +1169,11 @@ static void idefloppy_create_format_unit_cmd (idefloppy_pc_t *pc, int b, int l,
/* /*
* A mode sense command is used to "sense" floppy parameters. * A mode sense command is used to "sense" floppy parameters.
*/ */
static void idefloppy_create_mode_sense_cmd (idefloppy_pc_t *pc, byte page_code, byte type) static void idefloppy_create_mode_sense_cmd (idefloppy_pc_t *pc, u8 page_code, u8 type)
{ {
unsigned short length = sizeof (idefloppy_mode_parameter_header_t); u16 length = sizeof(idefloppy_mode_parameter_header_t);
idefloppy_init_pc (pc); idefloppy_init_pc(pc);
pc->c[0] = IDEFLOPPY_MODE_SENSE_CMD; pc->c[0] = IDEFLOPPY_MODE_SENSE_CMD;
pc->c[1] = 0; pc->c[1] = 0;
pc->c[2] = page_code + (type << 6); pc->c[2] = page_code + (type << 6);
...@@ -1299,15 +1186,16 @@ static void idefloppy_create_mode_sense_cmd (idefloppy_pc_t *pc, byte page_code, ...@@ -1299,15 +1186,16 @@ static void idefloppy_create_mode_sense_cmd (idefloppy_pc_t *pc, byte page_code,
length += 32; length += 32;
break; break;
default: default:
printk (KERN_ERR "ide-floppy: unsupported page code in create_mode_sense_cmd\n"); printk(KERN_ERR "ide-floppy: unsupported page code "
"in create_mode_sense_cmd\n");
} }
put_unaligned (htons (length), (unsigned short *) &pc->c[7]); put_unaligned(htons(length), (u16 *) &pc->c[7]);
pc->request_transfer = length; pc->request_transfer = length;
} }
static void idefloppy_create_start_stop_cmd (idefloppy_pc_t *pc, int start) static void idefloppy_create_start_stop_cmd (idefloppy_pc_t *pc, int start)
{ {
idefloppy_init_pc (pc); idefloppy_init_pc(pc);
pc->c[0] = IDEFLOPPY_START_STOP_CMD; pc->c[0] = IDEFLOPPY_START_STOP_CMD;
pc->c[4] = start; pc->c[4] = start;
} }
...@@ -1325,28 +1213,29 @@ static void idefloppy_create_rw_cmd (idefloppy_floppy_t *floppy, idefloppy_pc_t ...@@ -1325,28 +1213,29 @@ static void idefloppy_create_rw_cmd (idefloppy_floppy_t *floppy, idefloppy_pc_t
int cmd = rq_data_dir(rq); int cmd = rq_data_dir(rq);
#if IDEFLOPPY_DEBUG_LOG #if IDEFLOPPY_DEBUG_LOG
printk ("create_rw1%d_cmd: block == %d, blocks == %d\n", printk("create_rw1%d_cmd: block == %d, blocks == %d\n",
2 * test_bit (IDEFLOPPY_USE_READ12, &floppy->flags), block, blocks); 2 * test_bit (IDEFLOPPY_USE_READ12, &floppy->flags),
block, blocks);
#endif /* IDEFLOPPY_DEBUG_LOG */ #endif /* IDEFLOPPY_DEBUG_LOG */
idefloppy_init_pc (pc); idefloppy_init_pc(pc);
if (test_bit (IDEFLOPPY_USE_READ12, &floppy->flags)) { if (test_bit(IDEFLOPPY_USE_READ12, &floppy->flags)) {
pc->c[0] = cmd == READ ? IDEFLOPPY_READ12_CMD : IDEFLOPPY_WRITE12_CMD; pc->c[0] = cmd == READ ? IDEFLOPPY_READ12_CMD : IDEFLOPPY_WRITE12_CMD;
put_unaligned(htonl (blocks), (unsigned int *) &pc->c[6]); put_unaligned(htonl(blocks), (unsigned int *) &pc->c[6]);
} else { } else {
pc->c[0] = cmd == READ ? IDEFLOPPY_READ10_CMD : IDEFLOPPY_WRITE10_CMD; pc->c[0] = cmd == READ ? IDEFLOPPY_READ10_CMD : IDEFLOPPY_WRITE10_CMD;
put_unaligned(htons (blocks), (unsigned short *) &pc->c[7]); put_unaligned(htons(blocks), (unsigned short *) &pc->c[7]);
} }
put_unaligned(htonl (block), (unsigned int *) &pc->c[2]); put_unaligned(htonl(block), (unsigned int *) &pc->c[2]);
pc->callback = &idefloppy_rw_callback; pc->callback = &idefloppy_rw_callback;
pc->rq = rq; pc->rq = rq;
pc->b_data = rq->buffer; pc->b_data = rq->buffer;
pc->b_count = cmd == READ ? 0 : rq->bio->bi_size; pc->b_count = cmd == READ ? 0 : rq->bio->bi_size;
if (rq->flags & REQ_RW) if (rq->flags & REQ_RW)
set_bit (PC_WRITING, &pc->flags); set_bit(PC_WRITING, &pc->flags);
pc->buffer = NULL; pc->buffer = NULL;
pc->request_transfer = pc->buffer_size = blocks * floppy->block_size; pc->request_transfer = pc->buffer_size = blocks * floppy->block_size;
set_bit (PC_DMA_RECOMMENDED, &pc->flags); set_bit(PC_DMA_RECOMMENDED, &pc->flags);
} }
/* /*
...@@ -1375,7 +1264,7 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request ...@@ -1375,7 +1264,7 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request
else else
printk(KERN_ERR "ide-floppy: %s: I/O error\n", printk(KERN_ERR "ide-floppy: %s: I/O error\n",
drive->name); drive->name);
idefloppy_do_end_request(drive, 0); idefloppy_do_end_request(drive, 0, 0);
return ide_stopped; return ide_stopped;
} }
if (rq->flags & REQ_CMD) { if (rq->flags & REQ_CMD) {
...@@ -1383,17 +1272,17 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request ...@@ -1383,17 +1272,17 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request
(rq->nr_sectors % floppy->bs_factor)) { (rq->nr_sectors % floppy->bs_factor)) {
printk("%s: unsupported r/w request size\n", printk("%s: unsupported r/w request size\n",
drive->name); drive->name);
idefloppy_do_end_request(drive, 0); idefloppy_do_end_request(drive, 0, 0);
return ide_stopped; return ide_stopped;
} }
pc = idefloppy_next_pc_storage (drive); pc = idefloppy_next_pc_storage(drive);
idefloppy_create_rw_cmd (floppy, pc, rq, block); idefloppy_create_rw_cmd(floppy, pc, rq, block);
} else if (rq->flags & REQ_SPECIAL) { } else if (rq->flags & REQ_SPECIAL) {
pc = (idefloppy_pc_t *) rq->buffer; pc = (idefloppy_pc_t *) rq->buffer;
} else { } else {
blk_dump_rq_flags(rq, blk_dump_rq_flags(rq,
"ide-floppy: unsupported command in queue"); "ide-floppy: unsupported command in queue");
idefloppy_do_end_request(drive, 0); idefloppy_do_end_request(drive, 0, 0);
return ide_stopped; return ide_stopped;
} }
...@@ -1413,7 +1302,7 @@ static int idefloppy_queue_pc_tail (ide_drive_t *drive,idefloppy_pc_t *pc) ...@@ -1413,7 +1302,7 @@ static int idefloppy_queue_pc_tail (ide_drive_t *drive,idefloppy_pc_t *pc)
rq.buffer = (char *) pc; rq.buffer = (char *) pc;
rq.flags = REQ_SPECIAL; // rq.cmd = IDEFLOPPY_PC_RQ; rq.flags = REQ_SPECIAL; // rq.cmd = IDEFLOPPY_PC_RQ;
return ide_do_drive_cmd (drive, &rq, ide_wait); return ide_do_drive_cmd(drive, &rq, ide_wait);
} }
/* /*
...@@ -1428,19 +1317,20 @@ static int idefloppy_get_flexible_disk_page (ide_drive_t *drive) ...@@ -1428,19 +1317,20 @@ static int idefloppy_get_flexible_disk_page (ide_drive_t *drive)
idefloppy_flexible_disk_page_t *page; idefloppy_flexible_disk_page_t *page;
int capacity, lba_capacity; int capacity, lba_capacity;
idefloppy_create_mode_sense_cmd (&pc, IDEFLOPPY_FLEXIBLE_DISK_PAGE, MODE_SENSE_CURRENT); idefloppy_create_mode_sense_cmd(&pc, IDEFLOPPY_FLEXIBLE_DISK_PAGE, MODE_SENSE_CURRENT);
if (idefloppy_queue_pc_tail (drive,&pc)) { if (idefloppy_queue_pc_tail(drive,&pc)) {
printk (KERN_ERR "ide-floppy: Can't get flexible disk page parameters\n"); printk(KERN_ERR "ide-floppy: Can't get flexible disk "
"page parameters\n");
return 1; return 1;
} }
header = (idefloppy_mode_parameter_header_t *) pc.buffer; header = (idefloppy_mode_parameter_header_t *) pc.buffer;
floppy->wp = header->wp; floppy->wp = header->wp;
page = (idefloppy_flexible_disk_page_t *) (header + 1); page = (idefloppy_flexible_disk_page_t *) (header + 1);
page->transfer_rate = ntohs (page->transfer_rate); page->transfer_rate = ntohs(page->transfer_rate);
page->sector_size = ntohs (page->sector_size); page->sector_size = ntohs(page->sector_size);
page->cyls = ntohs (page->cyls); page->cyls = ntohs(page->cyls);
page->rpm = ntohs (page->rpm); page->rpm = ntohs(page->rpm);
capacity = page->cyls * page->heads * page->sectors * page->sector_size; capacity = page->cyls * page->heads * page->sectors * page->sector_size;
if (memcmp (page, &floppy->flexible_disk_page, sizeof (idefloppy_flexible_disk_page_t))) if (memcmp (page, &floppy->flexible_disk_page, sizeof (idefloppy_flexible_disk_page_t)))
printk(KERN_INFO "%s: %dkB, %d/%d/%d CHS, %d kBps, " printk(KERN_INFO "%s: %dkB, %d/%d/%d CHS, %d kBps, "
...@@ -1470,18 +1360,18 @@ static int idefloppy_get_capability_page(ide_drive_t *drive) ...@@ -1470,18 +1360,18 @@ static int idefloppy_get_capability_page(ide_drive_t *drive)
idefloppy_mode_parameter_header_t *header; idefloppy_mode_parameter_header_t *header;
idefloppy_capabilities_page_t *page; idefloppy_capabilities_page_t *page;
floppy->srfp=0; floppy->srfp = 0;
idefloppy_create_mode_sense_cmd (&pc, IDEFLOPPY_CAPABILITIES_PAGE, idefloppy_create_mode_sense_cmd(&pc, IDEFLOPPY_CAPABILITIES_PAGE,
MODE_SENSE_CURRENT); MODE_SENSE_CURRENT);
set_bit(PC_SUPPRESS_ERROR, &pc.flags); set_bit(PC_SUPPRESS_ERROR, &pc.flags);
if (idefloppy_queue_pc_tail (drive,&pc)) { if (idefloppy_queue_pc_tail(drive,&pc)) {
return 1; return 1;
} }
header = (idefloppy_mode_parameter_header_t *) pc.buffer; header = (idefloppy_mode_parameter_header_t *) pc.buffer;
page= (idefloppy_capabilities_page_t *)(header+1); page= (idefloppy_capabilities_page_t *)(header+1);
floppy->srfp=page->srfp; floppy->srfp = page->srfp;
return (0); return (0);
} }
...@@ -1502,57 +1392,76 @@ static int idefloppy_get_capacity (ide_drive_t *drive) ...@@ -1502,57 +1392,76 @@ static int idefloppy_get_capacity (ide_drive_t *drive)
floppy->blocks = floppy->bs_factor = 0; floppy->blocks = floppy->bs_factor = 0;
set_capacity(drive->disk, 0); set_capacity(drive->disk, 0);
idefloppy_create_read_capacity_cmd (&pc); idefloppy_create_read_capacity_cmd(&pc);
if (idefloppy_queue_pc_tail (drive, &pc)) { if (idefloppy_queue_pc_tail(drive, &pc)) {
printk (KERN_ERR "ide-floppy: Can't get floppy parameters\n"); printk(KERN_ERR "ide-floppy: Can't get floppy parameters\n");
return 1; return 1;
} }
header = (idefloppy_capacity_header_t *) pc.buffer; header = (idefloppy_capacity_header_t *) pc.buffer;
descriptors = header->length / sizeof (idefloppy_capacity_descriptor_t); descriptors = header->length / sizeof(idefloppy_capacity_descriptor_t);
descriptor = (idefloppy_capacity_descriptor_t *) (header + 1); descriptor = (idefloppy_capacity_descriptor_t *) (header + 1);
for (i = 0; i < descriptors; i++, descriptor++) { for (i = 0; i < descriptors; i++, descriptor++) {
blocks = descriptor->blocks = ntohl (descriptor->blocks); blocks = descriptor->blocks = ntohl(descriptor->blocks);
length = descriptor->length = ntohs (descriptor->length); length = descriptor->length = ntohs(descriptor->length);
if (!i) if (!i)
{ {
switch (descriptor->dc) { switch (descriptor->dc) {
case CAPACITY_UNFORMATTED: /* Clik! drive returns this instead of CAPACITY_CURRENT */ /* Clik! drive returns this instead of CAPACITY_CURRENT */
if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) case CAPACITY_UNFORMATTED:
break; /* If it is not a clik drive, break out (maintains previous driver behaviour) */ if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags))
case CAPACITY_CURRENT: /* Normal Zip/LS-120 disks */ /*
if (memcmp (descriptor, &floppy->capacity, sizeof (idefloppy_capacity_descriptor_t))) * If it is not a clik drive, break out
printk (KERN_INFO "%s: %dkB, %d blocks, %d sector size\n", drive->name, blocks * length / 1024, blocks, length); * (maintains previous driver behaviour)
floppy->capacity = *descriptor; */
if (!length || length % 512) break;
printk (KERN_NOTICE "%s: %d bytes block size not supported\n", drive->name, length); case CAPACITY_CURRENT:
else { /* Normal Zip/LS-120 disks */
if (memcmp(descriptor, &floppy->capacity, sizeof (idefloppy_capacity_descriptor_t)))
printk(KERN_INFO "%s: %dkB, %d blocks, %d "
"sector size\n", drive->name,
blocks * length / 1024, blocks, length);
floppy->capacity = *descriptor;
if (!length || length % 512) {
printk(KERN_NOTICE "%s: %d bytes block size "
"not supported\n", drive->name, length);
} else {
floppy->blocks = blocks; floppy->blocks = blocks;
floppy->block_size = length; floppy->block_size = length;
if ((floppy->bs_factor = length / 512) != 1) if ((floppy->bs_factor = length / 512) != 1)
printk (KERN_NOTICE "%s: warning: non 512 bytes block size not fully supported\n", drive->name); printk(KERN_NOTICE "%s: warning: non "
"512 bytes block size not "
"fully supported\n",
drive->name);
rc = 0; rc = 0;
} }
break; break;
case CAPACITY_NO_CARTRIDGE: case CAPACITY_NO_CARTRIDGE:
/* This is a KERN_ERR so it appears on screen for the user to see */ /*
printk (KERN_ERR "%s: No disk in drive\n", drive->name); * This is a KERN_ERR so it appears on screen
break; * for the user to see
case CAPACITY_INVALID: */
printk (KERN_ERR "%s: Invalid capacity for disk in drive\n", drive->name); printk(KERN_ERR "%s: No disk in drive\n", drive->name);
break; break;
case CAPACITY_INVALID:
printk(KERN_ERR "%s: Invalid capacity for disk "
"in drive\n", drive->name);
break;
} }
} }
if (!i) { if (!i) {
IDEFLOPPY_DEBUG( "Descriptor 0 Code: %d\n", descriptor->dc); IDEFLOPPY_DEBUG( "Descriptor 0 Code: %d\n",
descriptor->dc);
} }
IDEFLOPPY_DEBUG( "Descriptor %d: %dkB, %d blocks, %d sector size\n", i, blocks * length / 1024, blocks, length); IDEFLOPPY_DEBUG( "Descriptor %d: %dkB, %d blocks, %d "
"sector size\n", i, blocks * length / 1024, blocks,
length);
} }
/* Clik! disk does not support get_flexible_disk_page */ /* Clik! disk does not support get_flexible_disk_page */
if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) { if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) {
(void) idefloppy_get_flexible_disk_page (drive); (void) idefloppy_get_flexible_disk_page(drive);
} }
set_capacity(drive->disk, floppy->blocks * floppy->bs_factor); set_capacity(drive->disk, floppy->blocks * floppy->bs_factor);
...@@ -1599,18 +1508,18 @@ static int idefloppy_get_format_capacities (ide_drive_t *drive, ...@@ -1599,18 +1508,18 @@ static int idefloppy_get_format_capacities (ide_drive_t *drive,
if (u_array_size <= 0) if (u_array_size <= 0)
return (-EINVAL); return (-EINVAL);
idefloppy_create_read_capacity_cmd (&pc); idefloppy_create_read_capacity_cmd(&pc);
if (idefloppy_queue_pc_tail (drive, &pc)) { if (idefloppy_queue_pc_tail(drive, &pc)) {
printk (KERN_ERR "ide-floppy: Can't get floppy parameters\n"); printk(KERN_ERR "ide-floppy: Can't get floppy parameters\n");
return (-EIO); return (-EIO);
} }
header = (idefloppy_capacity_header_t *) pc.buffer; header = (idefloppy_capacity_header_t *) pc.buffer;
descriptors = header->length / descriptors = header->length /
sizeof (idefloppy_capacity_descriptor_t); sizeof(idefloppy_capacity_descriptor_t);
descriptor = (idefloppy_capacity_descriptor_t *) (header + 1); descriptor = (idefloppy_capacity_descriptor_t *) (header + 1);
u_index=0; u_index = 0;
argp=arg+1; argp = arg + 1;
/* /*
** We always skip the first capacity descriptor. That's the ** We always skip the first capacity descriptor. That's the
...@@ -1618,18 +1527,17 @@ static int idefloppy_get_format_capacities (ide_drive_t *drive, ...@@ -1618,18 +1527,17 @@ static int idefloppy_get_format_capacities (ide_drive_t *drive,
** the formattable capacities. ** the formattable capacities.
*/ */
for (i=0; i<descriptors; i++, descriptor++) for (i=0; i<descriptors; i++, descriptor++) {
{
if (u_index >= u_array_size) if (u_index >= u_array_size)
break; /* User-supplied buffer too small */ break; /* User-supplied buffer too small */
if (i == 0) if (i == 0)
continue; /* Skip the first descriptor */ continue; /* Skip the first descriptor */
blocks = ntohl (descriptor->blocks); blocks = ntohl(descriptor->blocks);
length = ntohs (descriptor->length); length = ntohs(descriptor->length);
if (put_user(blocks, argp)) if (put_user(blocks, argp))
return (-EFAULT); return(-EFAULT);
++argp; ++argp;
if (put_user(length, argp)) if (put_user(length, argp))
...@@ -1670,19 +1578,19 @@ static int idefloppy_begin_format(ide_drive_t *drive, ...@@ -1670,19 +1578,19 @@ static int idefloppy_begin_format(ide_drive_t *drive,
int flags; int flags;
idefloppy_pc_t pc; idefloppy_pc_t pc;
if (get_user(blocks, arg) if (get_user(blocks, arg) ||
|| get_user(length, arg+1) get_user(length, arg+1) ||
|| get_user(flags, arg+2)) get_user(flags, arg+2)) {
{
return (-EFAULT); return (-EFAULT);
} }
(void) idefloppy_get_capability_page (drive); /* Get the SFRP bit */ /* Get the SFRP bit */
(void) idefloppy_get_capability_page(drive);
idefloppy_create_format_unit_cmd(&pc, blocks, length, flags); idefloppy_create_format_unit_cmd(&pc, blocks, length, flags);
if (idefloppy_queue_pc_tail (drive, &pc)) if (idefloppy_queue_pc_tail(drive, &pc)) {
{
return (-EIO); return (-EIO);
} }
return (0); return (0);
} }
...@@ -1703,34 +1611,30 @@ static int idefloppy_get_format_progress(ide_drive_t *drive, ...@@ -1703,34 +1611,30 @@ static int idefloppy_get_format_progress(ide_drive_t *drive,
{ {
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
idefloppy_pc_t pc; idefloppy_pc_t pc;
int progress_indication=0x10000; int progress_indication = 0x10000;
if (floppy->srfp) if (floppy->srfp) {
{
idefloppy_create_request_sense_cmd(&pc); idefloppy_create_request_sense_cmd(&pc);
if (idefloppy_queue_pc_tail (drive, &pc)) if (idefloppy_queue_pc_tail(drive, &pc)) {
{
return (-EIO); return (-EIO);
} }
if (floppy->sense_key == 2 && floppy->asc == 4 && if (floppy->sense_key == 2 &&
floppy->ascq == 4) floppy->asc == 4 &&
{ floppy->ascq == 4) {
progress_indication=floppy->progress_indication; progress_indication = floppy->progress_indication;
} }
/* Else assume format_unit has finished, and we're /* Else assume format_unit has finished, and we're
** at 0x10000 */ ** at 0x10000 */
} } else {
else atapi_status_t status;
{
idefloppy_status_reg_t status;
unsigned long flags; unsigned long flags;
local_irq_save(flags); local_irq_save(flags);
status.all=GET_STAT(); status.all = HWIF(drive)->INB(IDE_STATUS_REG);
local_irq_restore(flags); local_irq_restore(flags);
progress_indication= !status.b.dsc ? 0:0x10000; progress_indication = !status.b.dsc ? 0 : 0x10000;
} }
if (put_user(progress_indication, arg)) if (put_user(progress_indication, arg))
return (-EFAULT); return (-EFAULT);
...@@ -1760,12 +1664,12 @@ static int idefloppy_ioctl (ide_drive_t *drive, struct inode *inode, struct file ...@@ -1760,12 +1664,12 @@ static int idefloppy_ioctl (ide_drive_t *drive, struct inode *inode, struct file
/* The IOMEGA Clik! Drive doesn't support this command - no room for an eject mechanism */ /* The IOMEGA Clik! Drive doesn't support this command - no room for an eject mechanism */
if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) { if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) {
idefloppy_create_prevent_cmd (&pc, prevent); idefloppy_create_prevent_cmd(&pc, prevent);
(void) idefloppy_queue_pc_tail (drive, &pc); (void) idefloppy_queue_pc_tail(drive, &pc);
} }
if (cmd == CDROMEJECT) { if (cmd == CDROMEJECT) {
idefloppy_create_start_stop_cmd (&pc, 2); idefloppy_create_start_stop_cmd(&pc, 2);
(void) idefloppy_queue_pc_tail (drive, &pc); (void) idefloppy_queue_pc_tail(drive, &pc);
} }
return 0; return 0;
case IDEFLOPPY_IOCTL_FORMAT_SUPPORTED: case IDEFLOPPY_IOCTL_FORMAT_SUPPORTED:
...@@ -1781,16 +1685,13 @@ static int idefloppy_ioctl (ide_drive_t *drive, struct inode *inode, struct file ...@@ -1781,16 +1685,13 @@ static int idefloppy_ioctl (ide_drive_t *drive, struct inode *inode, struct file
{ {
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
if (drive->usage > 1) if (drive->usage > 1) {
{
/* Don't format if someone is using the disk */ /* Don't format if someone is using the disk */
clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS,
&floppy->flags); &floppy->flags);
return -EBUSY; return -EBUSY;
} } else {
else
{
int rc; int rc;
set_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, set_bit(IDEFLOPPY_FORMAT_IN_PROGRESS,
...@@ -1829,7 +1730,7 @@ static int idefloppy_open (struct inode *inode, struct file *filp, ide_drive_t * ...@@ -1829,7 +1730,7 @@ static int idefloppy_open (struct inode *inode, struct file *filp, ide_drive_t *
idefloppy_pc_t pc; idefloppy_pc_t pc;
#if IDEFLOPPY_DEBUG_LOG #if IDEFLOPPY_DEBUG_LOG
printk (KERN_INFO "Reached idefloppy_open\n"); printk(KERN_INFO "Reached idefloppy_open\n");
#endif /* IDEFLOPPY_DEBUG_LOG */ #endif /* IDEFLOPPY_DEBUG_LOG */
MOD_INC_USE_COUNT; MOD_INC_USE_COUNT;
...@@ -1839,8 +1740,8 @@ static int idefloppy_open (struct inode *inode, struct file *filp, ide_drive_t * ...@@ -1839,8 +1740,8 @@ static int idefloppy_open (struct inode *inode, struct file *filp, ide_drive_t *
idefloppy_create_test_unit_ready_cmd(&pc); idefloppy_create_test_unit_ready_cmd(&pc);
if (idefloppy_queue_pc_tail(drive, &pc)) { if (idefloppy_queue_pc_tail(drive, &pc)) {
idefloppy_create_start_stop_cmd (&pc, 1); idefloppy_create_start_stop_cmd(&pc, 1);
(void) idefloppy_queue_pc_tail (drive, &pc); (void) idefloppy_queue_pc_tail(drive, &pc);
} }
if (idefloppy_get_capacity (drive) if (idefloppy_get_capacity (drive)
...@@ -1861,16 +1762,14 @@ static int idefloppy_open (struct inode *inode, struct file *filp, ide_drive_t * ...@@ -1861,16 +1762,14 @@ static int idefloppy_open (struct inode *inode, struct file *filp, ide_drive_t *
MOD_DEC_USE_COUNT; MOD_DEC_USE_COUNT;
return -EROFS; return -EROFS;
} }
set_bit (IDEFLOPPY_MEDIA_CHANGED, &floppy->flags); set_bit(IDEFLOPPY_MEDIA_CHANGED, &floppy->flags);
/* IOMEGA Clik! drives do not support lock/unlock commands */ /* IOMEGA Clik! drives do not support lock/unlock commands */
if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) { if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) {
idefloppy_create_prevent_cmd (&pc, 1); idefloppy_create_prevent_cmd(&pc, 1);
(void) idefloppy_queue_pc_tail (drive, &pc); (void) idefloppy_queue_pc_tail(drive, &pc);
} }
check_disk_change(inode->i_bdev); check_disk_change(inode->i_bdev);
} } else if (test_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags)) {
else if (test_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags))
{
drive->usage--; drive->usage--;
MOD_DEC_USE_COUNT; MOD_DEC_USE_COUNT;
return -EBUSY; return -EBUSY;
...@@ -1891,8 +1790,8 @@ static void idefloppy_release (struct inode *inode, struct file *filp, ide_drive ...@@ -1891,8 +1790,8 @@ static void idefloppy_release (struct inode *inode, struct file *filp, ide_drive
/* IOMEGA Clik! drives do not support lock/unlock commands */ /* IOMEGA Clik! drives do not support lock/unlock commands */
if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) { if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) {
idefloppy_create_prevent_cmd (&pc, 0); idefloppy_create_prevent_cmd(&pc, 0);
(void) idefloppy_queue_pc_tail (drive, &pc); (void) idefloppy_queue_pc_tail(drive, &pc);
} }
clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags); clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags);
...@@ -1907,7 +1806,7 @@ static int idefloppy_media_change (ide_drive_t *drive) ...@@ -1907,7 +1806,7 @@ static int idefloppy_media_change (ide_drive_t *drive)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
return test_and_clear_bit (IDEFLOPPY_MEDIA_CHANGED, &floppy->flags); return test_and_clear_bit(IDEFLOPPY_MEDIA_CHANGED, &floppy->flags);
} }
/* /*
...@@ -1937,109 +1836,114 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id) ...@@ -1937,109 +1836,114 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id)
{ {
struct idefloppy_id_gcw gcw; struct idefloppy_id_gcw gcw;
#if IDEFLOPPY_DEBUG_INFO #if IDEFLOPPY_DEBUG_INFO
unsigned short mask,i; u16 mask,i;
char buffer[80]; char buffer[80];
#endif /* IDEFLOPPY_DEBUG_INFO */ #endif /* IDEFLOPPY_DEBUG_INFO */
*((unsigned short *) &gcw) = id->config; *((u16 *) &gcw) = id->config;
#ifdef CONFIG_PPC #ifdef CONFIG_PPC
/* kludge for Apple PowerBook internal zip */ /* kludge for Apple PowerBook internal zip */
if ((gcw.device_type == 5) && !strstr(id->model, "CD-ROM") if ((gcw.device_type == 5) &&
&& strstr(id->model, "ZIP")) !strstr(id->model, "CD-ROM") &&
strstr(id->model, "ZIP"))
gcw.device_type = 0; gcw.device_type = 0;
#endif #endif
#if IDEFLOPPY_DEBUG_INFO #if IDEFLOPPY_DEBUG_INFO
printk (KERN_INFO "Dumping ATAPI Identify Device floppy parameters\n"); printk(KERN_INFO "Dumping ATAPI Identify Device floppy parameters\n");
switch (gcw.protocol) { switch (gcw.protocol) {
case 0: case 1: sprintf (buffer, "ATA");break; case 0: case 1: sprintf(buffer, "ATA");break;
case 2: sprintf (buffer, "ATAPI");break; case 2: sprintf(buffer, "ATAPI");break;
case 3: sprintf (buffer, "Reserved (Unknown to ide-floppy)");break; case 3: sprintf(buffer, "Reserved (Unknown to ide-floppy)");break;
} }
printk (KERN_INFO "Protocol Type: %s\n", buffer); printk(KERN_INFO "Protocol Type: %s\n", buffer);
switch (gcw.device_type) { switch (gcw.device_type) {
case 0: sprintf (buffer, "Direct-access Device");break; case 0: sprintf(buffer, "Direct-access Device");break;
case 1: sprintf (buffer, "Streaming Tape Device");break; case 1: sprintf(buffer, "Streaming Tape Device");break;
case 2: case 3: case 4: sprintf (buffer, "Reserved");break; case 2: case 3: case 4: sprintf (buffer, "Reserved");break;
case 5: sprintf (buffer, "CD-ROM Device");break; case 5: sprintf(buffer, "CD-ROM Device");break;
case 6: sprintf (buffer, "Reserved"); case 6: sprintf(buffer, "Reserved");
case 7: sprintf (buffer, "Optical memory Device");break; case 7: sprintf(buffer, "Optical memory Device");break;
case 0x1f: sprintf (buffer, "Unknown or no Device type");break; case 0x1f: sprintf(buffer, "Unknown or no Device type");break;
default: sprintf (buffer, "Reserved"); default: sprintf(buffer, "Reserved");
} }
printk (KERN_INFO "Device Type: %x - %s\n", gcw.device_type, buffer); printk(KERN_INFO "Device Type: %x - %s\n", gcw.device_type, buffer);
printk (KERN_INFO "Removable: %s\n",gcw.removable ? "Yes":"No"); printk(KERN_INFO "Removable: %s\n",gcw.removable ? "Yes":"No");
switch (gcw.drq_type) { switch (gcw.drq_type) {
case 0: sprintf (buffer, "Microprocessor DRQ");break; case 0: sprintf(buffer, "Microprocessor DRQ");break;
case 1: sprintf (buffer, "Interrupt DRQ");break; case 1: sprintf(buffer, "Interrupt DRQ");break;
case 2: sprintf (buffer, "Accelerated DRQ");break; case 2: sprintf(buffer, "Accelerated DRQ");break;
case 3: sprintf (buffer, "Reserved");break; case 3: sprintf(buffer, "Reserved");break;
} }
printk (KERN_INFO "Command Packet DRQ Type: %s\n", buffer); printk(KERN_INFO "Command Packet DRQ Type: %s\n", buffer);
switch (gcw.packet_size) { switch (gcw.packet_size) {
case 0: sprintf (buffer, "12 bytes");break; case 0: sprintf(buffer, "12 bytes");break;
case 1: sprintf (buffer, "16 bytes");break; case 1: sprintf(buffer, "16 bytes");break;
default: sprintf (buffer, "Reserved");break; default: sprintf(buffer, "Reserved");break;
} }
printk (KERN_INFO "Command Packet Size: %s\n", buffer); printk(KERN_INFO "Command Packet Size: %s\n", buffer);
printk (KERN_INFO "Model: %.40s\n",id->model); printk(KERN_INFO "Model: %.40s\n",id->model);
printk (KERN_INFO "Firmware Revision: %.8s\n",id->fw_rev); printk(KERN_INFO "Firmware Revision: %.8s\n",id->fw_rev);
printk (KERN_INFO "Serial Number: %.20s\n",id->serial_no); printk(KERN_INFO "Serial Number: %.20s\n",id->serial_no);
printk (KERN_INFO "Write buffer size(?): %d bytes\n",id->buf_size*512); printk(KERN_INFO "Write buffer size(?): %d bytes\n",id->buf_size*512);
printk (KERN_INFO "DMA: %s",id->capability & 0x01 ? "Yes\n":"No\n"); printk(KERN_INFO "DMA: %s",id->capability & 0x01 ? "Yes\n":"No\n");
printk (KERN_INFO "LBA: %s",id->capability & 0x02 ? "Yes\n":"No\n"); printk(KERN_INFO "LBA: %s",id->capability & 0x02 ? "Yes\n":"No\n");
printk (KERN_INFO "IORDY can be disabled: %s",id->capability & 0x04 ? "Yes\n":"No\n"); printk(KERN_INFO "IORDY can be disabled: %s",id->capability & 0x04 ? "Yes\n":"No\n");
printk (KERN_INFO "IORDY supported: %s",id->capability & 0x08 ? "Yes\n":"Unknown\n"); printk(KERN_INFO "IORDY supported: %s",id->capability & 0x08 ? "Yes\n":"Unknown\n");
printk (KERN_INFO "ATAPI overlap supported: %s",id->capability & 0x20 ? "Yes\n":"No\n"); printk(KERN_INFO "ATAPI overlap supported: %s",id->capability & 0x20 ? "Yes\n":"No\n");
printk (KERN_INFO "PIO Cycle Timing Category: %d\n",id->tPIO); printk(KERN_INFO "PIO Cycle Timing Category: %d\n",id->tPIO);
printk (KERN_INFO "DMA Cycle Timing Category: %d\n",id->tDMA); printk(KERN_INFO "DMA Cycle Timing Category: %d\n",id->tDMA);
printk (KERN_INFO "Single Word DMA supported modes:\n"); printk(KERN_INFO "Single Word DMA supported modes:\n");
for (i=0,mask=1;i<8;i++,mask=mask << 1) { for (i=0,mask=1;i<8;i++,mask=mask << 1) {
if (id->dma_1word & mask) if (id->dma_1word & mask)
printk (KERN_INFO " Mode %d%s\n", i, (id->dma_1word & (mask << 8)) ? " (active)" : ""); printk(KERN_INFO " Mode %d%s\n", i,
(id->dma_1word & (mask << 8)) ? " (active)" : "");
} }
printk (KERN_INFO "Multi Word DMA supported modes:\n"); printk(KERN_INFO "Multi Word DMA supported modes:\n");
for (i=0,mask=1;i<8;i++,mask=mask << 1) { for (i=0,mask=1;i<8;i++,mask=mask << 1) {
if (id->dma_mword & mask) if (id->dma_mword & mask)
printk (KERN_INFO " Mode %d%s\n", i, (id->dma_mword & (mask << 8)) ? " (active)" : ""); printk(KERN_INFO " Mode %d%s\n", i,
(id->dma_mword & (mask << 8)) ? " (active)" : "");
} }
if (id->field_valid & 0x0002) { if (id->field_valid & 0x0002) {
printk (KERN_INFO "Enhanced PIO Modes: %s\n",id->eide_pio_modes & 1 ? "Mode 3":"None"); printk(KERN_INFO "Enhanced PIO Modes: %s\n",
id->eide_pio_modes & 1 ? "Mode 3":"None");
if (id->eide_dma_min == 0) if (id->eide_dma_min == 0)
sprintf (buffer, "Not supported"); sprintf(buffer, "Not supported");
else else
sprintf (buffer, "%d ns",id->eide_dma_min); sprintf(buffer, "%d ns",id->eide_dma_min);
printk (KERN_INFO "Minimum Multi-word DMA cycle per word: %s\n", buffer); printk(KERN_INFO "Minimum Multi-word DMA cycle per word: %s\n", buffer);
if (id->eide_dma_time == 0) if (id->eide_dma_time == 0)
sprintf (buffer, "Not supported"); sprintf(buffer, "Not supported");
else else
sprintf (buffer, "%d ns",id->eide_dma_time); sprintf(buffer, "%d ns",id->eide_dma_time);
printk (KERN_INFO "Manufacturer\'s Recommended Multi-word cycle: %s\n", buffer); printk(KERN_INFO "Manufacturer\'s Recommended Multi-word cycle: %s\n", buffer);
if (id->eide_pio == 0) if (id->eide_pio == 0)
sprintf (buffer, "Not supported"); sprintf(buffer, "Not supported");
else else
sprintf (buffer, "%d ns",id->eide_pio); sprintf(buffer, "%d ns",id->eide_pio);
printk (KERN_INFO "Minimum PIO cycle without IORDY: %s\n", buffer); printk(KERN_INFO "Minimum PIO cycle without IORDY: %s\n",
buffer);
if (id->eide_pio_iordy == 0) if (id->eide_pio_iordy == 0)
sprintf (buffer, "Not supported"); sprintf(buffer, "Not supported");
else else
sprintf (buffer, "%d ns",id->eide_pio_iordy); sprintf(buffer, "%d ns",id->eide_pio_iordy);
printk (KERN_INFO "Minimum PIO cycle with IORDY: %s\n", buffer); printk(KERN_INFO "Minimum PIO cycle with IORDY: %s\n", buffer);
} else } else
printk (KERN_INFO "According to the device, fields 64-70 are not valid.\n"); printk(KERN_INFO "According to the device, fields 64-70 are not valid.\n");
#endif /* IDEFLOPPY_DEBUG_INFO */ #endif /* IDEFLOPPY_DEBUG_INFO */
if (gcw.protocol != 2) if (gcw.protocol != 2)
printk (KERN_ERR "ide-floppy: Protocol is not ATAPI\n"); printk(KERN_ERR "ide-floppy: Protocol is not ATAPI\n");
else if (gcw.device_type != 0) else if (gcw.device_type != 0)
printk (KERN_ERR "ide-floppy: Device type is not set to floppy\n"); printk(KERN_ERR "ide-floppy: Device type is not set to floppy\n");
else if (!gcw.removable) else if (!gcw.removable)
printk (KERN_ERR "ide-floppy: The removable flag is not set\n"); printk(KERN_ERR "ide-floppy: The removable flag is not set\n");
else if (gcw.drq_type == 3) { else if (gcw.drq_type == 3) {
printk (KERN_ERR "ide-floppy: Sorry, DRQ type %d not supported\n", gcw.drq_type); printk(KERN_ERR "ide-floppy: Sorry, DRQ type %d not supported\n", gcw.drq_type);
} else if (gcw.packet_size != 0) { } else if (gcw.packet_size != 0) {
printk (KERN_ERR "ide-floppy: Packet size is not 12 bytes long\n"); printk(KERN_ERR "ide-floppy: Packet size is not 12 bytes long\n");
} else } else
return 1; return 1;
return 0; return 0;
...@@ -2056,7 +1960,6 @@ static void idefloppy_add_settings(ide_drive_t *drive) ...@@ -2056,7 +1960,6 @@ static void idefloppy_add_settings(ide_drive_t *drive)
ide_add_setting(drive, "bios_head", SETTING_RW, -1, -1, TYPE_BYTE, 0, 255, 1, 1, &drive->bios_head, NULL); ide_add_setting(drive, "bios_head", SETTING_RW, -1, -1, TYPE_BYTE, 0, 255, 1, 1, &drive->bios_head, NULL);
ide_add_setting(drive, "bios_sect", SETTING_RW, -1, -1, TYPE_BYTE, 0, 63, 1, 1, &drive->bios_sect, NULL); ide_add_setting(drive, "bios_sect", SETTING_RW, -1, -1, TYPE_BYTE, 0, 63, 1, 1, &drive->bios_sect, NULL);
ide_add_setting(drive, "ticks", SETTING_RW, -1, -1, TYPE_BYTE, 0, 255, 1, 1, &floppy->ticks, NULL); ide_add_setting(drive, "ticks", SETTING_RW, -1, -1, TYPE_BYTE, 0, 255, 1, 1, &floppy->ticks, NULL);
} }
/* /*
...@@ -2066,14 +1969,14 @@ static void idefloppy_setup (ide_drive_t *drive, idefloppy_floppy_t *floppy) ...@@ -2066,14 +1969,14 @@ static void idefloppy_setup (ide_drive_t *drive, idefloppy_floppy_t *floppy)
{ {
struct idefloppy_id_gcw gcw; struct idefloppy_id_gcw gcw;
*((unsigned short *) &gcw) = drive->id->config; *((u16 *) &gcw) = drive->id->config;
drive->driver_data = floppy; drive->driver_data = floppy;
drive->ready_stat = 0; drive->ready_stat = 0;
memset (floppy, 0, sizeof (idefloppy_floppy_t)); memset(floppy, 0, sizeof(idefloppy_floppy_t));
floppy->drive = drive; floppy->drive = drive;
floppy->pc = floppy->pc_stack; floppy->pc = floppy->pc_stack;
if (gcw.drq_type == 1) if (gcw.drq_type == 1)
set_bit (IDEFLOPPY_DRQ_INTERRUPT, &floppy->flags); set_bit(IDEFLOPPY_DRQ_INTERRUPT, &floppy->flags);
/* /*
* We used to check revisions here. At this point however * We used to check revisions here. At this point however
* I'm giving up. Just assume they are all broken, its easier. * I'm giving up. Just assume they are all broken, its easier.
...@@ -2085,8 +1988,7 @@ static void idefloppy_setup (ide_drive_t *drive, idefloppy_floppy_t *floppy) ...@@ -2085,8 +1988,7 @@ static void idefloppy_setup (ide_drive_t *drive, idefloppy_floppy_t *floppy)
* we'll leave the limitation below for the 2.2.x tree. * we'll leave the limitation below for the 2.2.x tree.
*/ */
if (strcmp(drive->id->model, "IOMEGA ZIP 100 ATAPI") == 0) if (strcmp(drive->id->model, "IOMEGA ZIP 100 ATAPI") == 0) {
{
set_bit(IDEFLOPPY_ZIP_DRIVE, &floppy->flags); set_bit(IDEFLOPPY_ZIP_DRIVE, &floppy->flags);
/* This value will be visible in the /proc/ide/hdx/settings */ /* This value will be visible in the /proc/ide/hdx/settings */
floppy->ticks = IDEFLOPPY_TICKS_DELAY; floppy->ticks = IDEFLOPPY_TICKS_DELAY;
...@@ -2098,14 +2000,13 @@ static void idefloppy_setup (ide_drive_t *drive, idefloppy_floppy_t *floppy) ...@@ -2098,14 +2000,13 @@ static void idefloppy_setup (ide_drive_t *drive, idefloppy_floppy_t *floppy)
* above fix. It makes nasty clicking noises without * above fix. It makes nasty clicking noises without
* it, so please don't remove this. * it, so please don't remove this.
*/ */
if (strncmp(drive->id->model, "IOMEGA Clik!", 11) == 0) if (strncmp(drive->id->model, "IOMEGA Clik!", 11) == 0) {
{
blk_queue_max_sectors(&drive->queue, 64); blk_queue_max_sectors(&drive->queue, 64);
set_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags); set_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags);
} }
(void) idefloppy_get_capacity (drive); (void) idefloppy_get_capacity(drive);
idefloppy_add_settings(drive); idefloppy_add_settings(drive);
} }
...@@ -2114,10 +2015,10 @@ static int idefloppy_cleanup (ide_drive_t *drive) ...@@ -2114,10 +2015,10 @@ static int idefloppy_cleanup (ide_drive_t *drive)
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
struct gendisk *g = drive->disk; struct gendisk *g = drive->disk;
if (ide_unregister_subdriver (drive)) if (ide_unregister_subdriver(drive))
return 1; return 1;
drive->driver_data = NULL; drive->driver_data = NULL;
kfree (floppy); kfree(floppy);
del_gendisk(g); del_gendisk(g);
return 0; return 0;
} }
...@@ -2135,7 +2036,7 @@ static ide_proc_entry_t idefloppy_proc[] = { ...@@ -2135,7 +2036,7 @@ static ide_proc_entry_t idefloppy_proc[] = {
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
static int idefloppy_reinit(ide_drive_t *drive); static int idefloppy_attach(ide_drive_t *drive);
/* /*
* IDE subdriver functions, registered with ide.c * IDE subdriver functions, registered with ide.c
...@@ -2170,13 +2071,13 @@ static ide_driver_t idefloppy_driver = { ...@@ -2170,13 +2071,13 @@ static ide_driver_t idefloppy_driver = {
capacity: idefloppy_capacity, capacity: idefloppy_capacity,
special: NULL, special: NULL,
proc: idefloppy_proc, proc: idefloppy_proc,
reinit: idefloppy_reinit, attach: idefloppy_attach,
ata_prebuilder: NULL, ata_prebuilder: NULL,
atapi_prebuilder: NULL, atapi_prebuilder: NULL,
drives: LIST_HEAD_INIT(idefloppy_driver.drives), drives: LIST_HEAD_INIT(idefloppy_driver.drives),
}; };
static int idefloppy_reinit (ide_drive_t *drive) static int idefloppy_attach (ide_drive_t *drive)
{ {
idefloppy_floppy_t *floppy; idefloppy_floppy_t *floppy;
struct gendisk *g = drive->disk; struct gendisk *g = drive->disk;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7