Changeset bf474880 in rtems
- Timestamp:
- Nov 20, 2004, 4:03:21 AM (16 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- 468c6f00
- Parents:
- a3f1b54
- Location:
- c/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
c/src/ChangeLog
ra3f1b54 rbf474880 1 2004-11-20 Thomas Doerfler <Thomas.Doerfler@imd-systems.de>: 2 3 PR 703/filesystem 4 * libchip/ide/ata_internal.h, libchip/ide/ide_ctrl_cfg.h, 5 libchip/ide/ide_ctrl_io.h, libchip/ide/ata.c, 6 libchip/ide/ide_controller.c: 7 Move definitions for ATA modes into ide_ctrl_cfg.h, to make them 8 available for BSPS/device drivers. 9 Extend the "modes_available" and "mode_active" parameters to 10 uint16_t for UDMA support. 11 1 12 2004-11-10 Richard Campbell <richard.campbell@oarcorp.com> 2 13 -
c/src/libchip/ide/ata.c
ra3f1b54 rbf474880 1160 1160 } 1161 1161 else { 1162 ATA_DEV_INFO(ctrl_minor, dev).modes_avai ble =1162 ATA_DEV_INFO(ctrl_minor, dev).modes_available = 1163 1163 ((CF_LE_W(buffer[64]) & 0x1) ? ATA_MODES_PIO3 : 0) | 1164 1164 ((CF_LE_W(buffer[64]) & 0x2) ? ATA_MODES_PIO4 : 0) | … … 1168 1168 ((CF_LE_W(buffer[63]) & 0x4) ? 1169 1169 ATA_MODES_DMA0 | ATA_MODES_DMA1 | ATA_MODES_DMA2 : 0); 1170 if (ATA_DEV_INFO(ctrl_minor, dev).modes_avai ble == 0)1170 if (ATA_DEV_INFO(ctrl_minor, dev).modes_available == 0) 1171 1171 continue; 1172 1172 /* … … 1176 1176 status = ide_controller_config_io_speed( 1177 1177 ctrl_minor, 1178 ATA_DEV_INFO(ctrl_minor, dev).modes_avai ble);1178 ATA_DEV_INFO(ctrl_minor, dev).modes_available); 1179 1179 if (status != RTEMS_SUCCESSFUL) 1180 1180 continue; -
c/src/libchip/ide/ata_internal.h
ra3f1b54 rbf474880 52 52 53 53 #define ATA_MAX_CMD_REG_OFFSET 8 54 55 /* ATA modes */56 #define ATA_MODES_PIO3 0x00157 #define ATA_MODES_PIO4 0x00258 59 #define ATA_MODES_PIO 0x00360 61 #define ATA_MODES_DMA0 0x00462 #define ATA_MODES_DMA1 0x00863 #define ATA_MODES_DMA2 0x01064 65 #define ATA_MODES_UDMA0 0x02066 #define ATA_MODES_UDMA1 0x04067 #define ATA_MODES_UDMA2 0x08068 #define ATA_MODES_UDMA3 0x10069 #define ATA_MODES_UDMA4 0x20070 #define ATA_MODES_UDMA5 0x40071 72 #define ATA_MODES_UDMA 0x7e073 #define ATA_MODES_DMA 0x7fc74 54 75 55 … … 309 289 uint8_t current_multiple; 310 290 311 uint 8_t modes_avaible; /* OR of values for this modes */312 uint 8_tmode_active;291 uint16_t modes_available; /* OR of values for this modes */ 292 uint16_t mode_active; 313 293 } ata_dev_t; 314 294 -
c/src/libchip/ide/ide_controller.c
ra3f1b54 rbf474880 164 164 * 165 165 * PARAMETERS: 166 * minor - minor number of controller167 * modes_avai ble - speeds available166 * minor - minor number of controller 167 * modes_available - speeds available 168 168 * 169 169 * RETURNS: … … 172 172 */ 173 173 rtems_status_code 174 ide_controller_config_io_speed(int minor, uint 8_t modes_avaible)174 ide_controller_config_io_speed(int minor, uint16_t modes_available) 175 175 { 176 176 return IDE_Controller_Table[minor].fns->ctrl_config_io_speed( 177 177 minor, 178 modes_avai ble);178 modes_available); 179 179 } -
c/src/libchip/ide/ide_ctrl_cfg.h
ra3f1b54 rbf474880 2 2 * ide_ctrl_cfg.h 3 3 * 4 * LibChip library IDE controller header file - structu ers used for4 * LibChip library IDE controller header file - structures used for 5 5 * configuration and plugin interface definition. 6 6 * … … 30 30 IDE_CUSTOM /* BSP specific driver */ 31 31 } ide_ctrl_devs_t; 32 33 /* ATA modes: bit masks used in ctrl_config_io_speed call */ 34 #define ATA_MODES_PIO3 0x001 35 #define ATA_MODES_PIO4 0x002 36 37 #define ATA_MODES_PIO 0x003 38 39 #define ATA_MODES_DMA0 0x004 40 #define ATA_MODES_DMA1 0x008 41 #define ATA_MODES_DMA2 0x010 42 43 #define ATA_MODES_UDMA0 0x020 44 #define ATA_MODES_UDMA1 0x040 45 #define ATA_MODES_UDMA2 0x080 46 #define ATA_MODES_UDMA3 0x100 47 #define ATA_MODES_UDMA4 0x200 48 #define ATA_MODES_UDMA5 0x400 49 50 #define ATA_MODES_UDMA 0x7e0 51 #define ATA_MODES_DMA 0x7fc 52 32 53 33 54 /* … … 61 82 62 83 rtems_status_code (*ctrl_config_io_speed)(int minor, 63 uint 8_tmodes_available);84 uint16_t modes_available); 64 85 } ide_ctrl_fns_t; 65 86 -
c/src/libchip/ide/ide_ctrl_io.h
ra3f1b54 rbf474880 168 168 * 169 169 * PARAMETERS: 170 * minor - minor number of controller171 * modes_avai ble - speeds available170 * minor - minor number of controller 171 * modes_available - speeds available 172 172 * 173 173 * RETURNS: … … 176 176 */ 177 177 rtems_status_code 178 ide_controller_config_io_speed(int minor, uint 8_t modes_avaible);178 ide_controller_config_io_speed(int minor, uint16_t modes_available); 179 179 180 180 #ifdef __cplusplus
Note: See TracChangeset
for help on using the changeset viewer.