diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/config-m200v4.h | 3 | ||||
-rw-r--r-- | firmware/target/arm/as3525/power-as3525.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/as3525/usb-as3525.c | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/firmware/export/config-m200v4.h b/firmware/export/config-m200v4.h index dc127a7df9..75ac137ffd 100644 --- a/firmware/export/config-m200v4.h +++ b/firmware/export/config-m200v4.h | |||
@@ -66,9 +66,6 @@ | |||
66 | #define CONFIG_RTC RTC_AS3525 | 66 | #define CONFIG_RTC RTC_AS3525 |
67 | #endif | 67 | #endif |
68 | 68 | ||
69 | /* Hardware controlled charging */ | ||
70 | #define CONFIG_CHARGING CHARGING_SIMPLE | ||
71 | |||
72 | /* define this if you have RTC RAM available for settings */ | 69 | /* define this if you have RTC RAM available for settings */ |
73 | //#define HAVE_RTC_RAM | 70 | //#define HAVE_RTC_RAM |
74 | 71 | ||
diff --git a/firmware/target/arm/as3525/power-as3525.c b/firmware/target/arm/as3525/power-as3525.c index 3d191ec3b5..53b95e354d 100644 --- a/firmware/target/arm/as3525/power-as3525.c +++ b/firmware/target/arm/as3525/power-as3525.c | |||
@@ -37,6 +37,7 @@ void power_init(void) | |||
37 | { | 37 | { |
38 | } | 38 | } |
39 | 39 | ||
40 | #if CONFIG_CHARGING | ||
40 | bool charger_inserted(void) | 41 | bool charger_inserted(void) |
41 | { | 42 | { |
42 | if(ascodec_read(0x25) & (1<<5)) | 43 | if(ascodec_read(0x25) & (1<<5)) |
@@ -44,6 +45,7 @@ bool charger_inserted(void) | |||
44 | else | 45 | else |
45 | return false; | 46 | return false; |
46 | } | 47 | } |
48 | #endif | ||
47 | 49 | ||
48 | void ide_power_enable(bool on) | 50 | void ide_power_enable(bool on) |
49 | { | 51 | { |
diff --git a/firmware/target/arm/as3525/usb-as3525.c b/firmware/target/arm/as3525/usb-as3525.c index c9a6381b38..b151d5061a 100644 --- a/firmware/target/arm/as3525/usb-as3525.c +++ b/firmware/target/arm/as3525/usb-as3525.c | |||
@@ -35,7 +35,6 @@ void usb_init_device(void) | |||
35 | 35 | ||
36 | int usb_detect(void) | 36 | int usb_detect(void) |
37 | { | 37 | { |
38 | if (charger_inserted()) | 38 | /* TODO: Implement USB detection */ |
39 | return USB_INSERTED; | ||
40 | return USB_EXTRACTED; | 39 | return USB_EXTRACTED; |
41 | } | 40 | } |