Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 82127
b: refs/heads/master
c: d554336
h: refs/heads/master
i:
  82125: 6268360
  82123: 2a4326f
  82119: f8bbe9a
  82111: b374946
v: v3
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Feb 1, 2008
1 parent 76be445 commit 323cf3a
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 110 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7b9f25b539c3fa3c7b8c82775488a0021d90220f
refs/heads/master: d554336514a63342c2e4b06b4287ad93c112b00f
50 changes: 0 additions & 50 deletions trunk/drivers/ide/ide-floppy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1658,7 +1658,6 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id)
{
struct idefloppy_id_gcw gcw;
#if IDEFLOPPY_DEBUG_INFO
u16 mask,i;
char buffer[80];
#endif /* IDEFLOPPY_DEBUG_INFO */

Expand Down Expand Up @@ -1705,55 +1704,6 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id)
default: sprintf(buffer, "Reserved");break;
}
printk(KERN_INFO "Command Packet Size: %s\n", buffer);
printk(KERN_INFO "Model: %.40s\n",id->model);
printk(KERN_INFO "Firmware Revision: %.8s\n",id->fw_rev);
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 "DMA: %s",id->capability & 0x01 ? "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 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 "PIO Cycle Timing Category: %d\n",id->tPIO);
printk(KERN_INFO "DMA Cycle Timing Category: %d\n",id->tDMA);
printk(KERN_INFO "Single Word DMA supported modes:\n");
for (i=0,mask=1;i<8;i++,mask=mask << 1) {
if (id->dma_1word & mask)
printk(KERN_INFO " Mode %d%s\n", i,
(id->dma_1word & (mask << 8)) ? " (active)" : "");
}
printk(KERN_INFO "Multi Word DMA supported modes:\n");
for (i=0,mask=1;i<8;i++,mask=mask << 1) {
if (id->dma_mword & mask)
printk(KERN_INFO " Mode %d%s\n", i,
(id->dma_mword & (mask << 8)) ? " (active)" : "");
}
if (id->field_valid & 0x0002) {
printk(KERN_INFO "Enhanced PIO Modes: %s\n",
id->eide_pio_modes & 1 ? "Mode 3":"None");
if (id->eide_dma_min == 0)
sprintf(buffer, "Not supported");
else
sprintf(buffer, "%d ns",id->eide_dma_min);
printk(KERN_INFO "Minimum Multi-word DMA cycle per word: %s\n", buffer);
if (id->eide_dma_time == 0)
sprintf(buffer, "Not supported");
else
sprintf(buffer, "%d ns",id->eide_dma_time);
printk(KERN_INFO "Manufacturer\'s Recommended Multi-word cycle: %s\n", buffer);
if (id->eide_pio == 0)
sprintf(buffer, "Not supported");
else
sprintf(buffer, "%d ns",id->eide_pio);
printk(KERN_INFO "Minimum PIO cycle without IORDY: %s\n",
buffer);
if (id->eide_pio_iordy == 0)
sprintf(buffer, "Not supported");
else
sprintf(buffer, "%d ns",id->eide_pio_iordy);
printk(KERN_INFO "Minimum PIO cycle with IORDY: %s\n", buffer);
} else
printk(KERN_INFO "According to the device, fields 64-70 are not valid.\n");
#endif /* IDEFLOPPY_DEBUG_INFO */

if (gcw.protocol != 2)
Expand Down
59 changes: 0 additions & 59 deletions trunk/drivers/ide/ide-tape.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4291,9 +4291,6 @@ static int idetape_identify_device (ide_drive_t *drive)
{
struct idetape_id_gcw gcw;
struct hd_driveid *id = drive->id;
#if IDETAPE_DEBUG_INFO
unsigned short mask,i;
#endif /* IDETAPE_DEBUG_INFO */

if (drive->id_read == 0)
return 1;
Expand Down Expand Up @@ -4333,62 +4330,6 @@ static int idetape_identify_device (ide_drive_t *drive)
case 1: printk("16 bytes\n");break;
default: printk("Reserved\n");break;
}
printk(KERN_INFO "ide-tape: Model: %.40s\n",id->model);
printk(KERN_INFO "ide-tape: Firmware Revision: %.8s\n",id->fw_rev);
printk(KERN_INFO "ide-tape: Serial Number: %.20s\n",id->serial_no);
printk(KERN_INFO "ide-tape: Write buffer size: %d bytes\n",id->buf_size*512);
printk(KERN_INFO "ide-tape: DMA: %s",id->capability & 0x01 ? "Yes\n":"No\n");
printk(KERN_INFO "ide-tape: LBA: %s",id->capability & 0x02 ? "Yes\n":"No\n");
printk(KERN_INFO "ide-tape: IORDY can be disabled: %s",id->capability & 0x04 ? "Yes\n":"No\n");
printk(KERN_INFO "ide-tape: IORDY supported: %s",id->capability & 0x08 ? "Yes\n":"Unknown\n");
printk(KERN_INFO "ide-tape: ATAPI overlap supported: %s",id->capability & 0x20 ? "Yes\n":"No\n");
printk(KERN_INFO "ide-tape: PIO Cycle Timing Category: %d\n",id->tPIO);
printk(KERN_INFO "ide-tape: DMA Cycle Timing Category: %d\n",id->tDMA);
printk(KERN_INFO "ide-tape: Single Word DMA supported modes: ");
for (i=0,mask=1;i<8;i++,mask=mask << 1) {
if (id->dma_1word & mask)
printk("%d ",i);
if (id->dma_1word & (mask << 8))
printk("(active) ");
}
printk("\n");
printk(KERN_INFO "ide-tape: Multi Word DMA supported modes: ");
for (i=0,mask=1;i<8;i++,mask=mask << 1) {
if (id->dma_mword & mask)
printk("%d ",i);
if (id->dma_mword & (mask << 8))
printk("(active) ");
}
printk("\n");
if (id->field_valid & 0x0002) {
printk(KERN_INFO "ide-tape: Enhanced PIO Modes: %s\n",
id->eide_pio_modes & 1 ? "Mode 3":"None");
printk(KERN_INFO "ide-tape: Minimum Multi-word DMA cycle per word: ");
if (id->eide_dma_min == 0)
printk("Not supported\n");
else
printk("%d ns\n",id->eide_dma_min);

printk(KERN_INFO "ide-tape: Manufacturer\'s Recommended Multi-word cycle: ");
if (id->eide_dma_time == 0)
printk("Not supported\n");
else
printk("%d ns\n",id->eide_dma_time);

printk(KERN_INFO "ide-tape: Minimum PIO cycle without IORDY: ");
if (id->eide_pio == 0)
printk("Not supported\n");
else
printk("%d ns\n",id->eide_pio);

printk(KERN_INFO "ide-tape: Minimum PIO cycle with IORDY: ");
if (id->eide_pio_iordy == 0)
printk("Not supported\n");
else
printk("%d ns\n",id->eide_pio_iordy);

} else
printk(KERN_INFO "ide-tape: According to the device, fields 64-70 are not valid.\n");
#endif /* IDETAPE_DEBUG_INFO */

/* Check that we can support this device */
Expand Down

0 comments on commit 323cf3a

Please sign in to comment.