diff options
-rw-r--r-- | firmware/drivers/ata.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c index ae202e803a..20e6247fb9 100644 --- a/firmware/drivers/ata.c +++ b/firmware/drivers/ata.c | |||
@@ -69,7 +69,7 @@ | |||
69 | #define ATA_STATUS_IDX ATA_COMMAND_IDX | 69 | #define ATA_STATUS_IDX ATA_COMMAND_IDX |
70 | #define ATA_ALT_STATUS_IDX ATA_CONTROL_IDX | 70 | #define ATA_ALT_STATUS_IDX ATA_CONTROL_IDX |
71 | 71 | ||
72 | #define SET_REG(reg, value) (ide_write_register(reg, value)) | 72 | #define SET_REG(reg, value) (ide_write_register(reg ## _IDX, value)) |
73 | #define GET_REG(reg) (ide_read_register(reg)) | 73 | #define GET_REG(reg) (ide_read_register(reg)) |
74 | 74 | ||
75 | #define ATA_DATA (GET_REG(ATA_DATA_IDX)) | 75 | #define ATA_DATA (GET_REG(ATA_DATA_IDX)) |
@@ -86,17 +86,6 @@ | |||
86 | #define ATA_FEATURE (GET_REG(ATA_FEATURE_IDX)) | 86 | #define ATA_FEATURE (GET_REG(ATA_FEATURE_IDX)) |
87 | 87 | ||
88 | 88 | ||
89 | #define SET_ATA_DATA(v) (SET_REG(ATA_DATA_IDX,v)) | ||
90 | #define SET_ATA_SELECT(v) (SET_REG(ATA_SELECT_IDX,v)) | ||
91 | #define SET_ATA_NSECTOR(v) (SET_REG(ATA_NSECTOR_IDX,v)) | ||
92 | #define SET_ATA_SECTOR(v) (SET_REG(ATA_SECTOR_IDX,v)) | ||
93 | #define SET_ATA_LCYL(v) (SET_REG(ATA_LCYL_IDX,v)) | ||
94 | #define SET_ATA_HCYL(v) (SET_REG(ATA_HCYL_IDX,v)) | ||
95 | #define SET_ATA_COMMAND(v) (SET_REG(ATA_COMMAND_IDX,v)) | ||
96 | #define SET_ATA_CONTROL(v) (SET_REG(ATA_CONTROL_IDX,v)) | ||
97 | #define SET_ATA_FEATURE(v) (SET_REG(ATA_FEATURE_IDX, v)) | ||
98 | |||
99 | |||
100 | extern int idatastart __attribute__ ((section(".idata"))); | 89 | extern int idatastart __attribute__ ((section(".idata"))); |
101 | 90 | ||
102 | static unsigned ide_reg_temp __attribute__ ((section(".idata"))); | 91 | static unsigned ide_reg_temp __attribute__ ((section(".idata"))); |
@@ -153,6 +142,8 @@ int ide_read_register(int reg) { | |||
153 | 142 | ||
154 | #define SET_REG(reg, value) ((reg) = (value)) | 143 | #define SET_REG(reg, value) ((reg) = (value)) |
155 | 144 | ||
145 | #endif | ||
146 | |||
156 | #define SET_ATA_DATA(v) (SET_REG(ATA_DATA,v)) | 147 | #define SET_ATA_DATA(v) (SET_REG(ATA_DATA,v)) |
157 | #define SET_ATA_SELECT(v) (SET_REG(ATA_SELECT,v)) | 148 | #define SET_ATA_SELECT(v) (SET_REG(ATA_SELECT,v)) |
158 | #define SET_ATA_NSECTOR(v) (SET_REG(ATA_NSECTOR,v)) | 149 | #define SET_ATA_NSECTOR(v) (SET_REG(ATA_NSECTOR,v)) |
@@ -163,9 +154,6 @@ int ide_read_register(int reg) { | |||
163 | #define SET_ATA_CONTROL(v) (SET_REG(ATA_CONTROL,v)) | 154 | #define SET_ATA_CONTROL(v) (SET_REG(ATA_CONTROL,v)) |
164 | #define SET_ATA_FEATURE(v) (SET_REG(ATA_FEATURE, v)) | 155 | #define SET_ATA_FEATURE(v) (SET_REG(ATA_FEATURE, v)) |
165 | 156 | ||
166 | #endif | ||
167 | |||
168 | |||
169 | 157 | ||
170 | #define SELECT_DEVICE1 0x10 | 158 | #define SELECT_DEVICE1 0x10 |
171 | #define SELECT_LBA 0x40 | 159 | #define SELECT_LBA 0x40 |