3 files changed, 25 insertions, 3 deletions

diff --git a/apps/plugin.c b/apps/plugin.c
index b907604528..8b47af7e02 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -28,6 +28,7 @@
 #include "dir.h"
 #include "file.h"
 #include "kernel.h"
+#include "usb.h"
 #include "sprintf.h"
 #include "logf.h"
 #include "screens.h"
@@ -369,7 +370,16 @@ static const struct plugin_api rockbox_api = {
     profile_func_enter,
     profile_func_exit,
 #endif
-
+    battery_time,
+#ifndef SIMULATOR
+        ata_disk_is_active,
+        battery_voltage,
+#endif
+    queue_init,
+    queue_delete,
+    queue_post,
+    queue_wait_w_tmo,
+    usb_acknowledge,
 };
 
 int plugin_load(const char* plugin, void* parameter)
diff --git a/apps/plugin.h b/apps/plugin.h
index 157831bf19..747c9e099a 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -37,6 +37,7 @@
 #include "dir.h"
 #include "kernel.h"
 #include "button.h"
+#include "usb.h"
 #include "font.h"
 #include "system.h"
 #include "lcd.h"
@@ -96,7 +97,7 @@
 #define PLUGIN_MAGIC 0x526F634B /* RocK */
 
 /* increase this every time the api struct changes */
-#define PLUGIN_API_VERSION 2
+#define PLUGIN_API_VERSION 3
 
 /* update this to latest version if a change to the api struct breaks
    backwards compatibility (and please take the opportunity to sort in any 
@@ -427,13 +428,23 @@ struct plugin_api {
 
     /* new stuff at the end, sort into place next time
        the API gets incompatible */     
+       
 #ifdef RB_PROFILE
     void (*profile_thread)(void);
     void (*profstop)(void);
     void (*profile_func_enter)(void *this_fn, void *call_site);
     void (*profile_func_exit)(void *this_fn, void *call_site);
 #endif
-
+    int (*battery_time)(void);
+#ifndef SIMULATOR
+    bool (*ata_disk_is_active)(void);
+    unsigned int (*battery_voltage)(void);
+#endif
+    void (*queue_init)(struct event_queue *q);
+    void (*queue_delete)(struct event_queue *q);
+    void (*queue_post)(struct event_queue *q, long id, void *data);
+    void (*queue_wait_w_tmo)(struct event_queue *q, struct event *ev, int ticks);
+    void (*usb_acknowledge)(long id);
 };
 
 /* plugin header */
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 0b9f68bc0b..4da1d5ee6f 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -1,4 +1,5 @@
 /* plugins common to all models */
+battery_bench.c
 battery_test.c
 chessclock.c
 credits.c