diff options
Diffstat (limited to 'firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c')
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c index 2f28124edf..d33bcaaf6e 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c | |||
@@ -18,7 +18,6 @@ | |||
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #include "config.h" | 19 | #include "config.h" |
20 | #include "cpu.h" | 20 | #include "cpu.h" |
21 | #include <stdbool.h> | ||
22 | #include "kernel.h" | 21 | #include "kernel.h" |
23 | #include "thread.h" | 22 | #include "thread.h" |
24 | #include "system.h" | 23 | #include "system.h" |
@@ -48,13 +47,12 @@ void ata_reset(void) | |||
48 | /* This function is called before enabling the USB bus */ | 47 | /* This function is called before enabling the USB bus */ |
49 | void ata_enable(bool on) | 48 | void ata_enable(bool on) |
50 | { | 49 | { |
50 | GPBCON=( GPBCON&~(1<<11) ) | (1<<10); /* Make the pin an output */ | ||
51 | GPBUP|=1<<5; /* Disable pullup in SOC as we are now driving */ | ||
51 | if(on) | 52 | if(on) |
52 | USB_ATA_DISABLE; | 53 | USB_ATA_DISABLE; |
53 | else | 54 | else |
54 | USB_ATA_ENABLE; | 55 | USB_ATA_ENABLE; |
55 | |||
56 | GPBCON=( GPBCON&~(1<<11) ) | (1<<10); /* Make the pin an output */ | ||
57 | GPBUP|=1<<5; /* Disable pullup in SOC as we are now driving */ | ||
58 | } | 56 | } |
59 | 57 | ||
60 | bool ata_is_coldstart(void) | 58 | bool ata_is_coldstart(void) |
@@ -65,10 +63,10 @@ bool ata_is_coldstart(void) | |||
65 | 63 | ||
66 | void ata_device_init(void) | 64 | void ata_device_init(void) |
67 | { | 65 | { |
68 | /* ATA reset */ | ||
69 | ATA_RESET_DISABLE; /* Set the pin to disable an active low reset */ | ||
70 | GPGCON=( GPGCON&~(1<<21) ) | (1<<20); /* Make the pin an output */ | 66 | GPGCON=( GPGCON&~(1<<21) ) | (1<<20); /* Make the pin an output */ |
71 | GPGUP |= 1<<10; /* Disable pullup in SOC as we are now driving */ | 67 | GPGUP |= 1<<10; /* Disable pullup in SOC as we are now driving */ |
68 | /* ATA reset */ | ||
69 | ATA_RESET_DISABLE; /* Set the pin to disable an active low reset */ | ||
72 | } | 70 | } |
73 | 71 | ||
74 | #if !defined(BOOTLOADER) | 72 | #if !defined(BOOTLOADER) |