comparison packages/devs/disk/ide/current/src/ide_disk.c @ 2299:04006a2b020d

* src/ide_disk.h: DISK_FUNS is now implicitly static. (IDE_DISK_INSTANCE): Reflect updated io/disk API by using ide_disk_controller. * src/ide_disk.c: Define ide_disk_controller (even though unused in practice). (ide_disk_init): Provide phys_block_size and max_transfer disk ident members.
author jlarmour
date Thu, 21 Sep 2006 16:36:24 +0000
parents a06d718514f8
children 6d4c075d2939
comparison
equal deleted inserted replaced
2298:474e1f0afb12 2299:04006a2b020d
71 #else 71 #else
72 # define D(fmt,args...) 72 # define D(fmt,args...)
73 #endif 73 #endif
74 74
75 // ---------------------------------------------------------------------------- 75 // ----------------------------------------------------------------------------
76
77 // No h/w controller structure is needed in this driver, but the address of the
78 // second argument is taken anyway.
79 DISK_CONTROLLER(ide_disk_controller, ide_disk_controller);
76 80
77 #ifdef CYGVAR_DEVS_DISK_IDE_DISK0 81 #ifdef CYGVAR_DEVS_DISK_IDE_DISK0
78 IDE_DISK_INSTANCE(0, 0, 0, true, CYGDAT_IO_DISK_IDE_DISK0_NAME); 82 IDE_DISK_INSTANCE(0, 0, 0, true, CYGDAT_IO_DISK_IDE_DISK0_NAME);
79 #endif 83 #endif
80 84
353 ident.cylinders_num = ide_idData->num_cylinders; 357 ident.cylinders_num = ide_idData->num_cylinders;
354 ident.heads_num = ide_idData->num_heads; 358 ident.heads_num = ide_idData->num_heads;
355 ident.sectors_num = ide_idData->num_sectors; 359 ident.sectors_num = ide_idData->num_sectors;
356 ident.lba_sectors_num = ide_idData->lba_total_sectors[1] << 16 | 360 ident.lba_sectors_num = ide_idData->lba_total_sectors[1] << 16 |
357 ide_idData->lba_total_sectors[0]; 361 ide_idData->lba_total_sectors[0];
362 ident.phys_block_size = 1;
363 ident.max_transfer = 512;
358 364
359 D("\tSerial : %s\n", ident.serial); 365 D("\tSerial : %s\n", ident.serial);
360 D("\tFirmware rev. : %s\n", ident.firmware_rev); 366 D("\tFirmware rev. : %s\n", ident.firmware_rev);
361 D("\tModel : %s\n", ident.model_num); 367 D("\tModel : %s\n", ident.model_num);
362 D("\tC/H/S : %d/%d/%d\n", ident.cylinders_num, 368 D("\tC/H/S : %d/%d/%d\n", ident.cylinders_num,