Removed the Neo code. Nobody is interested in it.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5096 a1c6a512-1295-4272-9138-f99709370657

7 files changed, 1 insertions, 203 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:
diff --git a/firmware/export/button.h b/firmware/export/button.h
index 7ec484440f..50a9b1d8fd 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -36,49 +36,6 @@ void button_set_flip(bool flip); /* turn 180 degrees */
 
 #define BUTTON_NONE             0x0000
 
-#ifdef HAVE_NEO_KEYPAD
-/* neo button codes */
-#define BUTTON_UP               0x0080
-#define BUTTON_DOWN             0x0010
-#define BUTTON_LEFT             0x0001
-#define BUTTON_RIGHT            0x0002
-
-#define BUTTON_SELECT           0x0040
-
-#define BUTTON_ON BUTTON_SELECT
-
-#define BUTTON_PROGRAM          0x0020
-#define BUTTON_MENU             0x0004
-#define BUTTON_PLAY             0x0008
-#define BUTTON_STOP             0x0100
-
-#define BUTTON_IR               0x2000
-#define BUTTON_REPEAT           0x4000
-#define BUTTON_REL              0x8000
-
-#define BUTTON_FLAG_MASK        0xF000
-#define BUTTON_MASK             0x0FFF
-#define BUTTON_ALL              BUTTON_MASK
-#define BUTTON_ALL_FLAGS        BUTTON_FLAG_MASK
-
-#define NEO_IR_BUTTON_POWER     0x0001
-#define NEO_IR_BUTTON_SETTING   0x0002
-#define NEO_IR_BUTTON_REWIND    0x0004
-#define NEO_IR_BUTTON_FFORWARD  0x0008
-#define NEO_IR_BUTTON_PLAY      0x0010
-#define NEO_IR_BUTTON_VOLUP     0x0020
-#define NEO_IR_BUTTON_VOLDN     0x0040
-#define NEO_IR_BUTTON_BROWSE    0x0080
-#define NEO_IR_BUTTON_EQ        0x0100
-#define NEO_IR_BUTTON_MUTE      0x0200
-#define NEO_IR_BUTTON_PROGRAM   0x0400
-#define NEO_IR_BUTTON_STOP      0x0800
-#define NEO_IR_BUTTON_NONE      0x0000
-
-#define NEO_IR_BUTTON_REPEAT    0x1000
-
-#else
-
 /* Shared button codes */
 #define BUTTON_LEFT             0x0040
 #define BUTTON_RIGHT            0x0080
@@ -130,7 +87,5 @@ void button_set_flip(bool flip); /* turn 180 degrees */
 
 #endif /* HAVE_RECORDER/PLAYER/ONDIO_KEYPAD */
 
-#endif /* HAVE_NEO_KEYPAD */
-
 #endif /* _BUTTON_H_ */
 
diff --git a/firmware/export/config-neo35.h b/firmware/export/config-neo35.h
deleted file mode 100644
index fd5592f153..0000000000
--- a/firmware/export/config-neo35.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* define this if you have a charcell LCD display */
-#define HAVE_LCD_CHARCELLS 1
-
-/* define this if you have a neo-style LCD */
-#define HAVE_NEO_LCD 1
-
-/* define this if you have the Player's keyboard */
-#define HAVE_NEO_KEYPAD 1
-
-/* Define this if you have a SH7034 */
-#define HAVE_SH7034
-
-/* Define this if you have a MAS3507D */
-#define HAVE_MAS3507D
-
-/* Define this if you have a DAC3550A */
-#define HAVE_DAC3550A
-
-/* Define this to the CPU frequency */
-#define CPU_FREQ 12000000 /* cycle time ~83.3ns */
-
-/* Battery scale factor (?) */
-#define BATTERY_SCALE_FACTOR 6546
-
-/* Define this if you must discharge the data line by driving it low
-   and then set it to input to see if it stays low or goes high */
-#define HAVE_I2C_LOW_FIRST
-
-/* Define this if you control power on PADR (instead of PBDR) */
-#define HAVE_POWEROFF_ON_PADR
-
-/* Offset ( in the firmware file's header ) to the file length */
-#define FIRMWARE_OFFSET_FILE_LENGTH 0
-
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 4
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 6
-
-/* How to detect USB */
-#define USB_NONE 1
-
-/* If this is a Neo-style memory architecture platform */
-#define NEO_MEMORY 1
-
-/* Define this for programmable LED available */
-#define HAVE_LED
-
-/* Define this for LCD backlight available */
-#define HAVE_BACKLIGHT
-
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 359eadd82d..49306d4e81 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -28,8 +28,6 @@
 #include "config-fmrecorder.h"
 #elif defined(ARCHOS_RECORDERV2)
 #include "config-recorderv2.h"
-#elif defined(NEO_35)
-#include "config-neo35.h"
 #elif defined(ARCHOS_ONDIOSP)
 #include "config-ondiosp.h"
 #elif defined(ARCHOS_ONDIOFM)
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 21d1f4cc55..306e525b99 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -142,25 +142,4 @@ extern int  lcd_getstringsize(const unsigned char *str, int *w, int *h);
 
 #endif /* CHARCELLS / BITMAP */
 
-/* These control codes may only work on the Neo LCD display */
-#ifdef HAVE_NEO_LCD
-
-/* Cursor Control Instructions */
-#define LCD_OFFCUR    0x0C
-#define LCD_LINECUR   0x0E
-#define LCD_BLINKCUR  0x0D
-#define LCD_COMBNCUR  0x0F
-#define LCD_HOMECUR   0x02
-#define LCD_SHLFCUR   0x10
-#define LCD_SHRTCUR   0x14
-
-/* Display Control Instructions */
-#define LCD_CLEAR     0x01
-#define LCD_OFFDISP   0x08
-#define LCD_ONDISP    0x0C
-#define LCD_SHLFDISP  0x18
-#define LCD_SHRTDISP  0x1C
-#define LCD_SET_CGRAM 0x40
-#endif
-
 #endif /* __LCD_H__ */