3 files changed, 1 insertions, 83 deletions

diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 25cdd3d96b..263dce4d16 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -385,42 +385,6 @@ static int button_read(void)
     return btn;
 }
 
-#elif defined(HAVE_NEO_KEYPAD)
-static bool mStation = false;
-void button_init(void)
-{
-    /* set port pins as input */
-    PAIOR &= ~0x4000;  /* PA14 for stop button */
-
-    queue_init(&button_queue);
-    lastbtn = 0;
-    tick_add_task(button_tick);
-
-    reset_poweroff_timer();
-}
-int button_read(void)
-{
-    int btn=BUTTON_NONE;
-    
-    btn|=((~PCDR)&0xFF);
-
-    /* mStation does not have a stop button and this floods the button queue
-       with stops if used on a mStation */
-    if (!mStation)
-        btn|=((~(PADR>>6))&0x100);
-
-    return btn;
-}
-
-/* This function adds a button press event to the button queue, and this
-   really isn't anything Neo-specific but might be subject for adding to
-   the generic button driver */
-int button_add(unsigned int button)
-{
-    queue_post(&button_queue,button,NULL);
-    return 1;
-}
-
 #elif defined HAVE_ONDIO_KEYPAD
 
 /*
diff --git a/firmware/drivers/lcd-player.c b/firmware/drivers/lcd-player.c
index fb870f232a..01d7cfdb6e 100644
--- a/firmware/drivers/lcd-player.c
+++ b/firmware/drivers/lcd-player.c
@@ -488,11 +488,7 @@ void lcd_set_contrast(int val)
 
 void lcd_init (void)
 {
-#ifdef HAVE_NEO_LCD
-    new_lcd = true;
-#else
     new_lcd = has_new_lcd();
-#endif
     memset(extended_chars_mapped, NO_CHAR, sizeof(extended_chars_mapped));
     memset(extended_pattern_content, NO_CHAR,sizeof(extended_pattern_content));
     memset(extended_pattern_usage, 0, sizeof(extended_pattern_usage));
@@ -731,46 +727,4 @@ static void scroll_thread(void)
     }
 }
 
-#ifdef HAVE_NEO_LCD
-
-/*
- * Function use by the Neo code, but could/should be made a generic one.
- */
-void lcd_cursor(int x, int y)
-{
-    /* If we make sure the display size is setup with proper defines in the
-       config-*.h files, this should work on all displays */
-    if ((cursor.y_pos==y && cursor.x_pos==x) ||
-        x>=20 ||
-        y>3 ||
-        x<0 ||
-        y<0) {
-        DEBUGF("ignoring request for cursor to %d,%d - currently %d,%d\n",
-               x,y,cursor.x_pos,cursor.y_pos);
-        return;
-    }
-
-    char value=0;
-    
-    cursor.y_pos=y;
-    cursor.x_pos=x;
-    
-    switch (y) {
-        case 0:
-            value=0x80|x;
-            break;
-        case 1:
-            value=0x80|(x+0x40);
-            break;
-        case 2:
-            value=0x80|(x+0x14);
-            break;
-        case 3:
-            value=0x80|(x+0x54);
-            break;
-    }
-    lcd_write_command(value);
-}
-#endif
-
 #endif /* HAVE_LCD_CHARCELLS */
diff --git a/firmware/drivers/serial.c b/firmware/drivers/serial.c
index e1e0eb82e9..a66f3b1fa4 100644
--- a/firmware/drivers/serial.c
+++ b/firmware/drivers/serial.c
@@ -85,7 +85,7 @@ int remote_control_rx(void)
         }
         else
         {
-#if !defined(HAVE_NEO_KEYPAD) && !defined(HAVE_ONDIO_KEYPAD)
+#ifndef HAVE_ONDIO_KEYPAD
             switch (btn)
             {
                 case STOP: