1 files changed, 0 insertions, 287 deletions

diff --git a/apps/screens.c b/apps/screens.c
index bfc506d6b2..bc416f1baa 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -25,21 +25,11 @@
 #include "backlight.h"
 #include "action.h"
 #include "lcd.h"
-#ifdef HAVE_REMOTE_LCD
-#include "lcd-remote.h"
-#endif
 #include "lang.h"
 #include "icons.h"
 #include "font.h"
 #include "audio.h"
 #include "mp3_playback.h"
-#include "usb.h"
-#if defined(HAVE_USBSTACK)
-#include "usb_core.h"
-#ifdef USB_ENABLE_HID
-#include "usb_keymaps.h"
-#endif
-#endif
 #include "settings.h"
 #include "status.h"
 #include "playlist.h"
@@ -63,17 +53,8 @@
 #include "yesno.h"
 #include "backdrop.h"
 #include "viewport.h"
-#include "appevents.h"
 #include "language.h"
 
-#ifdef HAVE_LCD_BITMAP
-#include "bitmaps/usblogo.h"
-#endif
-
-#ifdef HAVE_REMOTE_LCD
-#include "bitmaps/remote_usblogo.h"
-#endif
-
 #if (CONFIG_STORAGE & STORAGE_MMC)
 #include "ata_mmc.h"
 #endif
@@ -93,274 +74,6 @@ static int clamp_value_wrap(int value, int max, int min)
 }
 #endif
 
-#ifndef SIMULATOR
-
-#ifdef USB_ENABLE_HID
-int usb_keypad_mode;
-#endif
-
-static int handle_usb_events(void)
-{
-#if (CONFIG_STORAGE & STORAGE_MMC)
-    int next_update=0;
-#endif /* STORAGE_MMC */
-
-    /* Don't return until we get SYS_USB_DISCONNECTED or SYS_TIMEOUT */
-    while(1)
-    {
-        int button;
-#ifdef USB_ENABLE_HID
-        if (usb_core_driver_enabled(USB_DRIVER_HID))
-        {
-            button = get_hid_usb_action();
-
-            /* On mode change, we need to refresh the screen */
-            if (button == ACTION_USB_HID_MODE_SWITCH_NEXT ||
-                    button == ACTION_USB_HID_MODE_SWITCH_PREV)
-            {
-                break;
-            }
-        }
-        else
-#endif
-        {
-            button = button_get_w_tmo(HZ/2);
-            /* hid emits the event in get_action */
-            send_event(GUI_EVENT_ACTIONUPDATE, NULL);
-        }
-
-        switch(button)
-        {
-            case SYS_USB_DISCONNECTED:
-                usb_acknowledge(SYS_USB_DISCONNECTED_ACK);
-                return 1;
-            case SYS_TIMEOUT:
-                break;
-        }
-
-#if (CONFIG_STORAGE & STORAGE_MMC) /* USB-MMC bridge can report activity */
-        if(TIME_AFTER(current_tick,next_update))
-        {
-            if(usb_inserted()) {
-                led(mmc_usb_active(HZ));
-            }
-            next_update=current_tick+HZ/2;
-        }
-#endif /* STORAGE_MMC */
-    }
-
-    return 0;
-}
-#endif
-
-#ifdef USB_NONE
-void usb_screen(void)
-{
-}
-#else
-#define MODE_NAME_LEN 32
-
-struct usb_screen_vps_t
-{
-    struct viewport parent;
-#ifdef HAVE_LCD_BITMAP
-    struct viewport logo;
-#ifdef USB_ENABLE_HID
-    struct viewport title;
-#endif
-#endif
-};
-
-#ifdef HAVE_LCD_BITMAP
-static void usb_screen_fix_viewports(struct screen *screen,
-        struct usb_screen_vps_t *usb_screen_vps)
-{
-    int logo_width, logo_height;
-    struct viewport *parent = &usb_screen_vps->parent;
-    struct viewport *logo = &usb_screen_vps->logo;
-
-#ifdef HAVE_REMOTE_LCD
-    if (screen->screen_type == SCREEN_REMOTE)
-    {
-        logo_width = BMPWIDTH_remote_usblogo;
-        logo_height = BMPHEIGHT_remote_usblogo;
-    }
-    else
-#endif
-    {
-        logo_width = BMPWIDTH_usblogo;
-        logo_height = BMPHEIGHT_usblogo;
-    }
-
-    viewport_set_defaults(parent, screen->screen_type);
-    if (parent->width < logo_width || parent->height < logo_height)
-        viewport_set_fullscreen(parent, screen->screen_type);
-
-    *logo = *parent;
-    logo->x = parent->width - logo_width;
-    logo->y = (parent->height - logo_height) / 2;
-    logo->width = logo_width;
-    logo->height = logo_height;
-
-#ifdef USB_ENABLE_HID
-    struct viewport *title = &usb_screen_vps->title;
-    int char_height, nb_lines;
-
-    /* nb_lines only returns the number of fully visible lines, small screens
-       or really large fonts could cause problems with the calculation below.
-       */
-    nb_lines = viewport_get_nb_lines(parent);
-    if (nb_lines == 0)
-        nb_lines++;
-
-    char_height = parent->height/nb_lines;
-
-    *title = *parent;
-    title->y = logo->y + logo->height + char_height;
-#endif
-}
-#endif
-
-static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar)
-{
-    int i;
-    int usb_bars = VP_SB_ALLSCREENS; /* force statusbars */
-
-    FOR_NB_SCREENS(i)
-    {
-        struct screen *screen = &screens[i];
-
-        struct usb_screen_vps_t *usb_screen_vps = &usb_screen_vps_ar[i];
-        struct viewport *parent = &usb_screen_vps->parent;
-#ifdef HAVE_LCD_BITMAP
-        struct viewport *logo = &usb_screen_vps->logo;
-#endif
-
-        screen->set_viewport(parent);
-        screen->backdrop_show(BACKDROP_MAIN);
-        screen->backlight_on();
-        screen->clear_viewport();
-
-#ifdef HAVE_LCD_BITMAP
-        screen->set_viewport(logo);
-#ifdef HAVE_REMOTE_LCD
-        if (i == SCREEN_REMOTE)
-        {
-            screen->bitmap(remote_usblogo, 0, 0, logo->width,
-                logo->height);
-        }
-        else
-#endif
-        {
-            screen->transparent_bitmap(usblogo, 0, 0, logo->width,
-                logo->height);
-#ifdef USB_ENABLE_HID
-            screen->set_viewport(&usb_screen_vps->title);
-            usb_screen_vps->title.flags |= VP_FLAG_ALIGN_CENTER;
-            screen->puts_scroll(0, 0, str(keypad_mode_name_get()));
-#endif /* USB_ENABLE_HID */
-        }
-        screen->set_viewport(parent);
-
-#else /* HAVE_LCD_BITMAP */
-        screen->double_height(false);
-        screen->puts_scroll(0, 0, "[USB Mode]");
-        status_set_param(false);
-        status_set_audio(false);
-        status_set_usb(true);
-#endif /* HAVE_LCD_BITMAP */
-
-        screen->update_viewport();
-        screen->set_viewport(NULL);
-
-        /* force statusbar by ignoring the setting */
-        usb_bars |= VP_SB_IGNORE_SETTING(i);
-    }
-
-    viewportmanager_set_statusbar(usb_bars);
-}
-
-void usb_screen(void)
-{
-    int i;
-    int old_bars  = viewportmanager_get_statusbar();
-    struct usb_screen_vps_t usb_screen_vps_ar[NB_SCREENS];
-#if defined HAVE_TOUCHSCREEN
-    enum touchscreen_mode old_mode = touchscreen_get_mode();
-
-    /* TODO: Paint buttons on screens OR switch to point mode and use
-     * touchscreen as a touchpad to move the host's mouse cursor */
-    touchscreen_set_mode(TOUCHSCREEN_BUTTON);
-#endif
-
-#ifndef SIMULATOR
-    usb_acknowledge(SYS_USB_CONNECTED_ACK);
-#endif
-
-#ifdef USB_ENABLE_HID
-    usb_keypad_mode = global_settings.usb_keypad_mode;
-#endif
-
-    FOR_NB_SCREENS(i)
-    {
-        struct screen *screen = &screens[i];
-
-        screen->set_viewport(NULL);
-#ifdef HAVE_LCD_BITMAP
-        usb_screen_fix_viewports(screen, &usb_screen_vps_ar[i]);
-#endif
-    }
-
-    while (1)
-    {
-        usb_screens_draw(usb_screen_vps_ar);
-#ifdef SIMULATOR
-        if (button_get_w_tmo(HZ/2))
-            break;
-        send_event(GUI_EVENT_ACTIONUPDATE, NULL);
-#else
-        if (handle_usb_events())
-            break;
-#endif /* SIMULATOR */
-    }
-
-    FOR_NB_SCREENS(i)
-    {
-        const struct viewport* vp = NULL;
-
-#if defined(HAVE_LCD_BITMAP) && defined(USB_ENABLE_HID)
-        vp = &usb_screen_vps_ar[i].title;
-#elif !defined(HAVE_LCD_BITMAP)
-        vp = &usb_screen_vps_ar[i].parent;
-#endif
-        if (vp)
-            screens[i].scroll_stop(vp);
-    }
-#ifdef USB_ENABLE_HID
-    if (global_settings.usb_keypad_mode != usb_keypad_mode)
-    {
-        global_settings.usb_keypad_mode = usb_keypad_mode;
-        settings_save();
-    }
-#endif
-
-#ifdef HAVE_TOUCHSCREEN
-    touchscreen_set_mode(old_mode);
-#endif
-
-#ifdef HAVE_LCD_CHARCELLS
-    status_set_usb(false);
-#endif /* HAVE_LCD_CHARCELLS */
-    FOR_NB_SCREENS(i)
-    {
-        screens[i].backlight_on();
-    }
-    viewportmanager_set_statusbar(old_bars);
-    send_event(GUI_EVENT_REFRESH, NULL);
-
-}
-#endif /* !defined(USB_NONE) */
-
 #if (CONFIG_STORAGE & STORAGE_MMC)
 int mmc_remove_request(void)
 {