5 files changed, 19 insertions, 11 deletions

diff --git a/firmware/export/ata.h b/firmware/export/ata.h
index 35538f6354..9b5bd36a5b 100644
--- a/firmware/export/ata.h
+++ b/firmware/export/ata.h
@@ -48,6 +48,7 @@ extern bool ata_disk_is_active(void);
 extern int ata_hard_reset(void);
 extern int ata_soft_reset(void);
 extern int ata_init(void);
+extern void ata_close(void);
 extern int ata_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf);
 extern int ata_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf);
 extern void ata_spin(void);
diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h
index 35c0f86178..895328d98e 100644
--- a/firmware/export/backlight.h
+++ b/firmware/export/backlight.h
@@ -28,6 +28,7 @@ void backlight_set_timeout(int value);
 
 #ifdef HAVE_BACKLIGHT
 void backlight_init(void);
+void backlight_close(void);
 
 int  backlight_get_current_timeout(void);
 
diff --git a/firmware/export/button.h b/firmware/export/button.h
index 6decf6ec69..82ea81ffab 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -29,6 +29,7 @@
 extern struct event_queue button_queue;
 
 void button_init (void);
+void button_close(void);
 int button_queue_count(void);
 long button_get (bool block);
 long button_get_w_tmo(int ticks);
diff --git a/firmware/export/config-gigabeat-s.h b/firmware/export/config-gigabeat-s.h
index d74f05ce9c..a0c05dad45 100644
--- a/firmware/export/config-gigabeat-s.h
+++ b/firmware/export/config-gigabeat-s.h
@@ -54,15 +54,6 @@
 /* Define this for LCD backlight available */
 #define HAVE_BACKLIGHT
 
-#define HAVE_LCD_ENABLE
-
-#define HAVE_BACKLIGHT_BRIGHTNESS
-
-/* Main LCD backlight brightness range and defaults */
-#define MIN_BRIGHTNESS_SETTING          0
-#define MAX_BRIGHTNESS_SETTING          24
-#define DEFAULT_BRIGHTNESS_SETTING      12
-
 /* Define this if you have a software controlled poweroff */
 #define HAVE_SW_POWEROFF
 
@@ -78,7 +69,20 @@
 #define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | \
                        SAMPR_CAP_11)
 
+#ifndef BOOTLOADER
+/* Not for bootloader */
+#define HAVE_LCD_ENABLE
+
+#define HAVE_BACKLIGHT_BRIGHTNESS
+
+/* Main LCD backlight brightness range and defaults */
+#define MIN_BRIGHTNESS_SETTING          0
+#define MAX_BRIGHTNESS_SETTING          24
+#define DEFAULT_BRIGHTNESS_SETTING      12
+
+
 #define HAVE_HEADPHONE_DETECTION
+#endif /* BOOTLOADER */
 
 #ifndef SIMULATOR
 
diff --git a/firmware/export/usb.h b/firmware/export/usb.h
index 4500cb2cde..ff1f55cd35 100644
--- a/firmware/export/usb.h
+++ b/firmware/export/usb.h
@@ -31,7 +31,8 @@ enum {
     USB_TRANSFER_COMPLETION,
     USB_REQUEST_DISK,
     USB_RELEASE_DISK,
-    USB_REQUEST_REBOOT
+    USB_REQUEST_REBOOT,
+    USB_QUIT,
 };
 
 
@@ -89,7 +90,7 @@ struct usb_transfer_completion_event_data
 void usb_init(void);
 void usb_enable(bool on);
 void usb_start_monitoring(void);
-void usb_stop_monitoring(void);
+void usb_close(void);
 void usb_acknowledge(long id);
 void usb_wait_for_disconnect(struct event_queue *q);
 int usb_wait_for_disconnect_w_tmo(struct event_queue *q, int ticks);