Index: firmware/config.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/config.h,v
retrieving revision 1.9
diff -u -r1.9 config.h
--- firmware/config.h	16 Jan 2003 13:27:06 -0000	1.9
+++ firmware/config.h	22 Jan 2003 10:43:22 -0000
@@ -25,8 +25,7 @@
 #elif defined(ARCHOS_RECORDER)
 #include "config-recorder.h"
 #elif defined(ARCHOS_FMRECORDER)
-/* include the standard recorder config for now */
-#include "config-recorder.h"
+#include "config-fmrecorder.h"
 #else
 /* no known platform */
 #endif
Index: firmware/usb.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/usb.c,v
retrieving revision 1.22
diff -u -r1.22 usb.c
--- firmware/usb.c	16 Jan 2003 15:11:29 -0000	1.22
+++ firmware/usb.c	22 Jan 2003 10:43:22 -0000
@@ -218,7 +218,7 @@
 #ifdef ARCHOS_RECORDER
         current_status = (adc_read(ADC_USB_POWER) > 500)?true:false;
 #else
-#ifdef ARCHOS_FMRECORDER
+#ifdef HAVE_FMADC
         current_status = (adc_read(ADC_USB_POWER) < 512)?true:false;
 #else
         current_status = (PADR & 0x8000)?false:true;
Index: firmware/drivers/adc.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/adc.h,v
retrieving revision 1.6
diff -u -r1.6 adc.h
--- firmware/drivers/adc.h	21 Jan 2003 19:37:28 -0000	1.6
+++ firmware/drivers/adc.h	22 Jan 2003 10:43:22 -0000
@@ -24,12 +24,18 @@
 #define ADC_BATTERY             0 /* Battery voltage always reads 0x3FF due to
                                      silly scaling */
 #ifdef HAVE_FMADC
+
 #define ADC_CHARGE_REGULATOR    0 /* Uh, we read the battery voltage? */
+
+#define ADC_USB_POWER           1 /* USB, reads 0x000 when USB is inserted */
+
 #else
+
 #define ADC_CHARGE_REGULATOR    1 /* Regulator reference voltage, should read
                                      about 0x1c0 when charging, else 0x3FF */
-#endif
 #define ADC_USB_POWER           2 /* USB, reads 0x3FF when USB is inserted */
+
+#endif
 
 #define ADC_BUTTON_ROW1         4 /* Used for scanning the keys, different
                                      voltages for different keys */