|
@@ -124,12 +124,6 @@ typedef struct ide_floppy_obj {
|
|
|
|
|
|
#define IDEFLOPPY_TICKS_DELAY HZ/20 /* default delay for ZIP 100 (50ms) */
|
|
|
|
|
|
-/* Defines for the MODE SENSE command */
|
|
|
-#define MODE_SENSE_CURRENT 0x00
|
|
|
-#define MODE_SENSE_CHANGEABLE 0x01
|
|
|
-#define MODE_SENSE_DEFAULT 0x02
|
|
|
-#define MODE_SENSE_SAVED 0x03
|
|
|
-
|
|
|
/* IOCTLs used in low-level formatting. */
|
|
|
#define IDEFLOPPY_IOCTL_FORMAT_SUPPORTED 0x4600
|
|
|
#define IDEFLOPPY_IOCTL_FORMAT_GET_CAPACITY 0x4601
|
|
@@ -501,14 +495,14 @@ static void idefloppy_create_format_unit_cmd(struct ide_atapi_pc *pc, int b,
|
|
|
|
|
|
/* A mode sense command is used to "sense" floppy parameters. */
|
|
|
static void idefloppy_create_mode_sense_cmd(struct ide_atapi_pc *pc,
|
|
|
- u8 page_code, u8 type)
|
|
|
+ u8 page_code)
|
|
|
{
|
|
|
u16 length = 8; /* sizeof(Mode Parameter Header) = 8 Bytes */
|
|
|
|
|
|
idefloppy_init_pc(pc);
|
|
|
pc->c[0] = GPCMD_MODE_SENSE_10;
|
|
|
pc->c[1] = 0;
|
|
|
- pc->c[2] = page_code + (type << 6);
|
|
|
+ pc->c[2] = page_code;
|
|
|
|
|
|
switch (page_code) {
|
|
|
case IDEFLOPPY_CAPABILITIES_PAGE:
|
|
@@ -669,8 +663,7 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive)
|
|
|
u16 transfer_rate, sector_size, cyls, rpm;
|
|
|
u8 heads, sectors;
|
|
|
|
|
|
- idefloppy_create_mode_sense_cmd(&pc, IDEFLOPPY_FLEXIBLE_DISK_PAGE,
|
|
|
- MODE_SENSE_CURRENT);
|
|
|
+ idefloppy_create_mode_sense_cmd(&pc, IDEFLOPPY_FLEXIBLE_DISK_PAGE);
|
|
|
|
|
|
if (idefloppy_queue_pc_tail(drive, &pc)) {
|
|
|
printk(KERN_ERR "ide-floppy: Can't get flexible disk page"
|
|
@@ -718,10 +711,10 @@ static int idefloppy_get_sfrp_bit(ide_drive_t *drive)
|
|
|
struct ide_atapi_pc pc;
|
|
|
|
|
|
floppy->srfp = 0;
|
|
|
- idefloppy_create_mode_sense_cmd(&pc, IDEFLOPPY_CAPABILITIES_PAGE,
|
|
|
- MODE_SENSE_CURRENT);
|
|
|
|
|
|
+ idefloppy_create_mode_sense_cmd(&pc, IDEFLOPPY_CAPABILITIES_PAGE);
|
|
|
pc.flags |= PC_FLAG_SUPPRESS_ERROR;
|
|
|
+
|
|
|
if (idefloppy_queue_pc_tail(drive, &pc))
|
|
|
return 1;
|
|
|
|