8 files changed, 12 insertions, 389 deletions

diff --git a/firmware/export/button.h b/firmware/export/button.h
index 240ec08d9b..9c0fe639a6 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -151,27 +151,6 @@ void wheel_send_events(bool send);
 
 #define BUTTON_REMOTE 0
 
-#elif CONFIG_KEYPAD == GMINI100_PAD
-
-  /* Gmini specific button codes */
-
-#define BUTTON_ON           0x00000001
-#define BUTTON_OFF          0x00000002
-
-#define BUTTON_LEFT         0x00000004
-#define BUTTON_RIGHT        0x00000008
-#define BUTTON_UP           0x00000010
-#define BUTTON_DOWN         0x00000020
-
-#define BUTTON_PLAY         0x00000040
-#define BUTTON_MENU         0x00000080
-
-#define BUTTON_MAIN (BUTTON_ON|BUTTON_OFF|BUTTON_LEFT|BUTTON_RIGHT\
-                |BUTTON_UP|BUTTON_DOWN|BUTTON_PLAY|BUTTON_MENU)
-
-#define BUTTON_REMOTE 0
-
-
 #elif 0
 
 /* 
@@ -186,7 +165,7 @@ void wheel_send_events(bool send);
 
 
 
-#endif /* RECORDER/PLAYER/ONDIO/GMINI KEYPAD */
+#endif /* RECORDER/PLAYER/ONDIO KEYPAD */
 
 #endif /* TARGET_TREE */
 
diff --git a/firmware/export/config-gmini120.h b/firmware/export/config-gmini120.h
deleted file mode 100644
index a393b17a8a..0000000000
--- a/firmware/export/config-gmini120.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Note: this is just a basic early version that needs attention and
-   corrections! */
-
-/* define this if you have recording possibility */
-#define HAVE_RECORDING 1
-
-/* define this if you have a bitmap LCD display */
-#define HAVE_LCD_BITMAP 1
-
-/* define this if you can invert the colours on your LCD */
-#define HAVE_LCD_INVERT
-
-/* define this if you have a real-time clock */
-#define CONFIG_RTC RTC_M41ST84W
-
-/* define this if you have RTC RAM available for settings */
-#define HAVE_RTC_RAM 1
-
-/* define this if you would like tagcache to build on this target */
-#define HAVE_TAGCACHE
-
-/* LCD dimensions */
-#define LCD_WIDTH  128
-#define LCD_HEIGHT 64
-#define LCD_DEPTH  1
-
-#define CONFIG_KEYPAD GMINI100_PAD
-
-/* Define this if you have a software controlled poweroff */
-#define HAVE_SW_POWEROFF
-
-/* The number of bytes reserved for loadable codecs. Although in this case
-   the codec won't be loadable... */
-#define CODEC_SIZE 0x40000
-
-/* The number of bytes reserved for loadable plugins */
-#define PLUGIN_BUFFER_SIZE 0x80000
-
-#define BATTERY_CAPACITY_DEFAULT 2200 /* default battery capacity */
-
-#ifndef SIMULATOR
-
-/* Define this if you have a TCC730 (CalmRISC16) */
-#define CONFIG_CPU TCC730
-
-/* Define this if you have a gmini 100 style LCD */
-#define CONFIG_LCD LCD_GMINI100
-
-#define CONFIG_I2C I2C_GMINI
-
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
-
-/* Type of mobile power, FIXME: probably different, make new type */
-#define CONFIG_BATTERY BATT_LIION2200
-#define BATTERY_CAPACITY_MIN 2200 /* min. capacity selectable */
-#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */
-#define BATTERY_CAPACITY_INC 50   /* capacity increment */
-#define BATTERY_TYPES_COUNT  1    /* only one type */
-#define BATTERY_SCALE_FACTOR 6465
-/* chosen values at random -- jyp */
-
-/* Hardware controlled charging? FIXME */
-#define CONFIG_CHARGING CHARGING_SIMPLE
-
-#define CPU_FREQ 30000000
-/* approximate value (and false in general since freq is variable) */
-
-/* Always enable debug till we stabilize */
-#define EMULATOR
-
-#define USB_GMINISTYLE
-
-#define CONFIG_I2C I2C_GMINI
-
-#define CONFIG_BACKLIGHT BL_GMINI
-
-#define GMINI_ARCH
-
-/* Software controlled LED */
-#define CONFIG_LED LED_REAL
-
-/* Define this if you have adjustable CPU frequency */
-#define HAVE_ADJUSTABLE_CPU_FREQ
-
-#endif
diff --git a/firmware/export/config-gminisp.h b/firmware/export/config-gminisp.h
deleted file mode 100644
index 1c1f299afa..0000000000
--- a/firmware/export/config-gminisp.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Note: this is just a basic early version that needs attention and
-   corrections! */
-
-/* define this if you have a bitmap LCD display */
-#define HAVE_LCD_BITMAP 1
-
-/* define this if you can invert the colours on your LCD */
-#define HAVE_LCD_INVERT
-
-/* define this if you would like tagcache to build on this target */
-#define HAVE_TAGCACHE
-
-/* LCD dimensions */
-#define LCD_WIDTH  128
-#define LCD_HEIGHT 64
-#define LCD_DEPTH  1
-
-#define CONFIG_KEYPAD GMINI100_PAD
-
-/* Define this if you have a software controlled poweroff */
-#define HAVE_SW_POWEROFF
-
-/* The number of bytes reserved for loadable codecs. Although in this case
-   the codec won't be loadable... */
-#define CODEC_SIZE 0x40000
-
-/* The number of bytes reserved for loadable plugins */
-#define PLUGIN_BUFFER_SIZE 0x80000
-
-#define BATTERY_CAPACITY_DEFAULT 2200 /* default battery capacity */
-
-#ifndef SIMULATOR
-
-/* Define this if you have a TCC730 (CalmRISC16) */
-#define CONFIG_CPU TCC730
-
-/* Define this if you have a gmini 100 style LCD */
-#define CONFIG_LCD LCD_GMINI100
-
-#define CONFIG_I2C I2C_GMINI
-
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
-
-/* Type of mobile power, FIXME: probably different, make new type */
-#define CONFIG_BATTERY BATT_LIION2200
-#define BATTERY_CAPACITY_MIN 2200 /* min. capacity selectable */
-#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */
-#define BATTERY_CAPACITY_INC 50   /* capacity increment */
-#define BATTERY_TYPES_COUNT  1    /* only one type */
-#define BATTERY_SCALE_FACTOR 6465
-/* chosen values at random -- jyp */
-
-/* Hardware controlled charging? FIXME */
-#define CONFIG_CHARGING CHARGING_SIMPLE
-
-#define CPU_FREQ 30000000
-/* approximate value (and false in general since freq is variable) */
-
-/* Always enable debug till we stabilize */
-#define EMULATOR
-
-#define USB_GMINISTYLE
-
-#define CONFIG_I2C I2C_GMINI
-
-#define CONFIG_BACKLIGHT BL_GMINI
-
-#define GMINI_ARCH
-
-/* Software controlled LED */
-#define CONFIG_LED LED_REAL
-
-/* Define this if you have adjustable CPU frequency */
-#define HAVE_ADJUSTABLE_CPU_FREQ
-
-#endif
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 45d974a96f..440c0faef3 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -40,7 +40,6 @@
 #define SH7034  7034
 #define MCF5249 5249
 #define MCF5250 5250
-#define TCC730   730   /* lacking a proper abbrivation */
 #define PP5002  5002
 #define PP5020  5020
 #define PNX0101  101
@@ -48,11 +47,10 @@
 #define PP5024  5024
 
 /* CONFIG_KEYPAD */
-#define PLAYER_PAD          0
-#define RECORDER_PAD        1
-#define ONDIO_PAD           2
-#define IRIVER_H100_PAD     3
-#define GMINI100_PAD        4
+#define PLAYER_PAD          1
+#define RECORDER_PAD        2
+#define ONDIO_PAD           3
+#define IRIVER_H100_PAD     4
 #define IRIVER_H300_PAD     5
 #define IAUDIO_X5_PAD       6
 #define IPOD_4G_PAD         7
@@ -83,7 +81,6 @@
 #define CHARGING_CONTROL 3 /* Software controlled charging */
 
 /* CONFIG_LCD */
-#define LCD_GMINI100  0
 #define LCD_SSD1815   1 /* as used by Archos Recorders and Ondios */
 #define LCD_SSD1801   2 /* as used by Archos Player/Studio */
 #define LCD_S1D15E06  3 /* as used by iRiver H100 series */
@@ -111,11 +108,10 @@
 #define RGB565SWAPPED 3553
 
 /* CONFIG_BACKLIGHT */
-#define BL_PA14_LO       0 /* Player, PA14 low active */
-#define BL_RTC           1 /* Recorder, RTC square wave output */
-#define BL_PA14_HI       2 /* Ondio, PA14 high active */
-#define BL_IRIVER_H100   3 /* IRiver GPIO */
-#define BL_GMINI         4 /* Archos GMini */
+#define BL_PA14_LO       1 /* Player, PA14 low active */
+#define BL_RTC           2 /* Recorder, RTC square wave output */
+#define BL_PA14_HI       3 /* Ondio, PA14 high active */
+#define BL_IRIVER_H100   4 /* IRiver GPIO */
 #define BL_IPOD4G        5 /* Apple iPod 4G */
 #define BL_IPODNANO      6 /* Apple iPod Nano and iPod Video*/
 #define BL_IPOD3G        7 /* Apple iPod 3g with dock */
@@ -129,9 +125,8 @@
 #define BL_TPJ1022       15 /* Tatung Elio TPJ-1022 */
 
 /* CONFIG_I2C */
-#define I2C_PLAYREC  0 /* Archos Player/Recorder style */
-#define I2C_ONDIO    1 /* Ondio style */
-#define I2C_GMINI    2 /* Gmini style */
+#define I2C_PLAYREC  1 /* Archos Player/Recorder style */
+#define I2C_ONDIO    2 /* Ondio style */
 #define I2C_COLDFIRE 3 /* Coldfire style */
 #define I2C_PP5002   4 /* PP5002 style */
 #define I2C_PP5020   5 /* PP5020 style */
@@ -139,7 +134,7 @@
 #define I2C_S3C2440  7
 
 /* CONFIG_LED */
-#define LED_REAL     1 /* SW controlled LED (Archos recorders, player, Gmini) */
+#define LED_REAL     1 /* SW controlled LED (Archos recorders, player) */
 #define LED_VIRTUAL  2 /* Virtual LED (icon) (Archos Ondio) */
 /* else                   HW controlled LED (iRiver H1x0) */
 
@@ -180,10 +175,6 @@
 #include "config-h120.h"
 #elif defined(IRIVER_H300)
 #include "config-h300.h"
-#elif defined(ARCHOS_GMINI120)
-#include "config-gmini120.h"
-#elif defined(ARCHOS_GMINISP)
-#include "config-gminisp.h"
 #elif defined(IAUDIO_X5)
 #include "config-iaudiox5.h"
 #elif defined(IPOD_COLOR)
@@ -286,7 +277,6 @@
     defined(CPU_COLDFIRE) || /* Coldfire: core, plugins, codecs */ \
     (CONFIG_CPU == PP5020) ||  /* iPod and H10: core, plugins, codecs */ \
     (CONFIG_CPU == PP5002) ||  /* iPod: core, plugins, codecs */ \
-    (CONFIG_CPU == TCC730) || /* CalmRISC16: core, (plugins, codecs) */ \
     (CONFIG_CPU == PNX0101))
 #define ICODE_ATTR      __attribute__ ((section(".icode")))
 #define ICONST_ATTR     __attribute__ ((section(".irodata")))
diff --git a/firmware/export/cpu.h b/firmware/export/cpu.h
index 93b66aac52..6adf52ba5e 100644
--- a/firmware/export/cpu.h
+++ b/firmware/export/cpu.h
@@ -27,9 +27,6 @@
 #if CONFIG_CPU == MCF5250
 #include "mcf5250.h"
 #endif
-#if CONFIG_CPU == TCC730
-#include "tcc730.h"
-#endif
 #if CONFIG_CPU == PP5020
 #include "pp5020.h"
 #endif
diff --git a/firmware/export/system.h b/firmware/export/system.h
index 9b90a6e80c..3ec599d62b 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -371,72 +371,6 @@ void irq_set_int_handler(int n, interrupt_handler_t handler);
 void irq_enable_int(int n);
 #endif
 
-#elif CONFIG_CPU == TCC730
-
-extern int smsc_version(void);
-
-extern void smsc_delay(void);
-
-extern void set_pll_freq(int pll_index, long freq_out);
-
-
-extern void* volatile interrupt_vector[16]  __attribute__ ((section(".idata")));
-
-extern void ddma_transfer(int dir, int mem, void* intAddr, long extAddr,
-                          int num);
-
-
-#define HIGHEST_IRQ_LEVEL (1)
-static inline int set_irq_level(int level)
-{
-  int result;
-  __asm__ ("ld %0, 0\n\t"
-       "tstsr ie\n\t"
-       "incc %0" : "=r"(result));
-  if (level > 0)
-    __asm__ volatile ("clrsr ie");
-  else
-    __asm__ volatile ("setsr ie");
-
-  return result;
-}
-
-static inline unsigned short swap16(unsigned short value)
-    /*
-      result[15..8] = value[ 7..0];
-      result[ 7..0] = value[15..8];
-    */
-{
-    return (value >> 8) | (value << 8);
-}
-
-static inline unsigned long swap32(unsigned long value)
-    /*
-      result[31..24] = value[ 7.. 0];
-      result[23..16] = value[15.. 8];
-      result[15.. 8] = value[23..16];
-      result[ 7.. 0] = value[31..24];
-    */
-{
-    unsigned long hi = swap16(value >> 16);
-    unsigned long lo = swap16(value & 0xffff);
-    return (lo << 16) | hi;
-}
-
-/* Archos uses:
-
-22MHz: busy wait on dma
-32MHz: normal
-80Mhz: heavy load
-
-*/
-
-#define CPUFREQ_DEFAULT CPU_FREQ
-#define CPUFREQ_NORMAL (32000000)
-#define CPUFREQ_MAX    (80000000)
-
-#define invalidate_icache()
-
 #endif
 
 #ifndef CPU_COLDFIRE
diff --git a/firmware/export/tcc730.h b/firmware/export/tcc730.h
deleted file mode 100644
index c1208ecc28..0000000000
--- a/firmware/export/tcc730.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2005 by Jean-Philippe Bernardy
- *
- * All files in this archive are subject to the GNU General Public License.
- * See the file COPYING in the source tree root for full license agreement.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-#ifndef TCC730_H
-#define TCC730_H
-
-/* int is 16 bit 
-   long is 32 bit */
-
-#define IOBASE (0x3f0000)
-#define MMIO(t, x) (*(volatile t*)(IOBASE+(x))) 
-
-#define OSCCON MMIO(unsigned char, 0x01)
-#define WTCON  MMIO(unsigned char, 0x02)
-#define BTCON  MMIO(unsigned char, 0x04)
-#define BTCNT  MMIO(unsigned char, 0x05)
-#define WDTEN  MMIO(unsigned char, 0x06)
-#define WDTCON MMIO(unsigned char, 0x07)
-
-#define TACON  MMIO(unsigned char, 0x08)
-#define TAPRE  MMIO(unsigned char, 0x09)
-#define TADATA MMIO(unsigned int, 0x0A)
-#define TACNT  MMIO(unsigned int, 0x0C)
-
-#define IMR0 MMIO(unsigned int, 0x22)
-#define IMR1 MMIO(unsigned int, 0x2A)
-
-#define P0  MMIO(unsigned char, 0x30)
-#define P1  MMIO(unsigned char, 0x31)
-#define P2  MMIO(unsigned char, 0x32)
-#define P3  MMIO(unsigned char, 0x33)
-#define P4  MMIO(unsigned char, 0x34)
-#define P5  MMIO(unsigned char, 0x35)
-#define P6  MMIO(unsigned char, 0x36)
-#define P7  MMIO(unsigned char, 0x37)
-#define P8  MMIO(unsigned char, 0x38)
-#define P9  MMIO(unsigned char, 0x39)
-#define P10 MMIO(unsigned char, 0x3A)
-
-#define P0CON    MMIO(unsigned char,0x40)
-#define P1CON    MMIO(unsigned char,0x41)
-#define P2CON    MMIO(unsigned int,0x42)
-#define P2CONH   MMIO(unsigned char,0x42)
-#define P2CONL   MMIO(unsigned char,0x43)
-#define P3CON    MMIO(unsigned int,0x44)
-#define P3CONH   MMIO(unsigned char,0x44)
-#define P3CONL   MMIO(unsigned char,0x45)
-#define P3PUR    MMIO(unsigned char,0x46)
-#define P5CON    MMIO(unsigned char,0x48)
-#define P5PUR    MMIO(unsigned char,0x49)
-#define P5INTMOD MMIO(unsigned int,0x4A)
-#define P5INTCON MMIO(unsigned char,0x4C)
-#define P4CON    MMIO(unsigned char,0x50)
-#define P4INTCON MMIO(unsigned char,0x51)
-#define P4INTMOD MMIO(unsigned char,0x52)
-#define P6CON    MMIO(unsigned char,0x53)
-#define P7CON    MMIO(unsigned char,0x54)
-#define P8CON    MMIO(unsigned char,0x55)
-#define P9CON    MMIO(unsigned char,0x56)
-#define P10CON   MMIO(unsigned char,0x57)
-
-#define IISCON0  MMIO(unsigned char, 0x0a0)
-#define IISMODE0 MMIO(unsigned char, 0x0a1)
-#define IISPTR0  MMIO(unsigned char, 0x0a2)
-#define IISCON1  MMIO(unsigned char, 0x0a3)
-#define IISMODE1 MMIO(unsigned char, 0x0a4)
-#define IISPTR1  MMIO(unsigned char, 0x0a5)
-
-#define ADDATA MMIO(unsigned int, 0x74)
-#define ADCON  MMIO(unsigned char, 0x76)
-
-#define PLL0DATA MMIO(unsigned int, 0xA8)
-#define PLL0CON  MMIO(unsigned char, 0xAA)
-#define PLL1DATA MMIO(unsigned int, 0xAC)
-#define PLL1CON  MMIO(unsigned char, 0xAE)
-
-#define IISBUF ((volatile unsigned int*)(IOBASE+(0x0c0)))
-
-#define MIUSCFG MMIO(unsigned char, 0x110)
-#define MIUDCOM MMIO(unsigned char, 0x111)
-#define MIUDCFG MMIO(unsigned int, 0x112)
-#define MIUDCNT MMIO(unsigned int, 0x114)
-
-#define DDMACOM  MMIO(unsigned char, 0x120)
-#define DDMACFG  MMIO(unsigned char, 0x121)
-#define DDMAIADR MMIO(unsigned long, 0x122)
-#define DDMAEADR MMIO(unsigned long, 0x126)
-#define DDMANUM  MMIO(unsigned int, 0x12A)
-#define DDMACNT  MMIO(unsigned int, 0x12C)
-
-#endif
diff --git a/firmware/export/thread.h b/firmware/export/thread.h
index 72c692ec3b..8bb9ae2608 100644
--- a/firmware/export/thread.h
+++ b/firmware/export/thread.h
@@ -74,13 +74,6 @@ struct regs
     unsigned int lr;     /* r14 (lr) */
     void         *start; /* Thread start address, or NULL when started */
 };
-# elif CONFIG_CPU == TCC730
-struct regs
-{
-    void *sp;    /* Stack pointer (a15) */
-    void *start; /* Thread start address */
-    int started; /* 0 when not started */
-};
 # endif
 
 #endif /* !SIMULATOR */