M:Robe 500: Remove some dead test code in bootloader, reorganize the bootloader link script, and remove an unnecessary lcd disable/enable in initialization.

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

2 files changed, 2 insertions, 146 deletions

diff --git a/bootloader/common.c b/bootloader/common.c
index 7159faa..c9309a6 100644
--- a/bootloader/common.c
+++ b/bootloader/common.c
@@ -40,7 +40,8 @@
 #if defined(IPOD_ARCH) || defined(IRIVER_H10)  || defined(IRIVER_H10_5GB) \
  || defined(SANSA_E200) || defined(SANSA_C200) || defined(GIGABEAT_F) \
  || defined(PHILIPS_SA9200) || (CONFIG_CPU == AS3525) || defined(COWON_D2) \
- || defined(MROBE_100) || defined(PHILIPS_HDD1630) || defined(ONDA_VX747)
+ || defined(MROBE_100) || defined(PHILIPS_HDD1630) || defined(ONDA_VX747) \
+ || defined(MROBE_500)
 bool verbose = false;
 #else
 bool verbose = true;
diff --git a/bootloader/mrobe500.c b/bootloader/mrobe500.c
index e503baa..9052cbd 100644
--- a/bootloader/mrobe500.c
+++ b/bootloader/mrobe500.c
@@ -46,147 +46,6 @@
 #include "time.h"
 #include "system-arm.h"
 
-//#define MRDEBUG
-
-#if defined(MRDEBUG)
-
-extern int line;
-#if 0
-struct touch_calibration_point tl, br;
-
-void touchscreen_get_one_point(struct touch_calibration_point *p)
-{
-    int data = 0;
-    int start = current_tick;
-    while (TIME_AFTER(start+(HZ/3), current_tick))
-    {
-        if (button_read_device()&BUTTON_TOUCHSCREEN)
-        {
-            data = button_get_last_touch();
-            p->val_x = data>>16;
-            p->val_y = data&0xffff;
-            start = current_tick;
-        }
-        else if (data == 0)
-            start = current_tick;
-    }
-}
-
-#define MARGIN 25
-#define LEN    7
-void touchscreen_calibrate_screen(void)
-{
-    reset_screen();
-    printf("touch the center of the crosshairs to calibrate");
-    /* get the topleft value */
-    lcd_hline(MARGIN-LEN, MARGIN+LEN, MARGIN);
-    lcd_vline(MARGIN, MARGIN-LEN, MARGIN+LEN);
-    lcd_update();
-    tl.px_x = MARGIN; tl.px_y = MARGIN;
-    touchscreen_get_one_point(&tl);
-    reset_screen();
-    printf("touch the center of the crosshairs to calibrate");
-    /* get the topright value */
-    lcd_hline(LCD_WIDTH-MARGIN-LEN, LCD_WIDTH-MARGIN+LEN, LCD_HEIGHT-MARGIN);
-    lcd_vline(LCD_WIDTH-MARGIN, LCD_HEIGHT-MARGIN-LEN, LCD_HEIGHT-MARGIN+LEN);
-    lcd_update();
-    br.px_x = LCD_WIDTH-MARGIN; br.px_y = LCD_HEIGHT-MARGIN;
-    touchscreen_get_one_point(&br);
-    reset_screen();
-    line++;
-    printf("tl %d %d", tl.val_x, tl.val_y);
-    printf("br %d %d", br.val_x, br.val_y);
-    line++;
-    set_calibration_points(&tl, &br);
-}
-#endif
-static uint8_t bl_command[] = {0xa4, 0x00, 0x00, 0xbb};
-int brightness = 0;
-
-void mrdebug(void)
-{
-    int button=0;
-#if 0
-    use_calibration(false);
-    touchscreen_calibrate_screen();
-    use_calibration(true);
-#endif
-
-    while(true)
-    {
-#if 0
-        struct tm *t = get_time();
-        printf("%d:%d:%d %d %d %d", t->tm_hour, t->tm_min, t->tm_sec, t->tm_mday, t->tm_mon, t->tm_year);
-        printf("time: %d", mktime(t));
-#endif
-       button = button_get(false);
-        if (button == BUTTON_POWER)
-        {
-            printf("reset");
-            IO_GIO_BITSET1|=1<<10;
-        }
-        if (button==BUTTON_RC_VOL_DOWN) 
-        {
-            brightness = (brightness - 5) & 0x7f;
-            bl_command[2] = brightness;
-            spi_block_transfer(SPI_target_BACKLIGHT, bl_command, 4, 0, 0);
-        } 
-        else if (button==BUTTON_RC_VOL_UP)
-        {
-            brightness = (brightness + 5) & 0x7f;
-            bl_command[2] = brightness;
-            spi_block_transfer(SPI_target_BACKLIGHT, bl_command, 4, 0, 0);
-        }
-//         {
-//             short x,y,z1,z2;
-//             tsc2100_read_values(&x, &y, &z1, &z2);
-//             printf("x: %04x y: %04x z1: %04x z2: %04x", x, y, z1, z2);
-//             printf("tsadc: %4x", tsc2100_readreg(TSADC_PAGE, TSADC_ADDRESS)&0xffff);
-// //            tsc2100_keyclick(); /* doesnt work :( */
-//             line -= 6;
-//         }
-        else if (button == BUTTON_RC_HEART)
-        {
-            printf("POINT");
-            touchscreen_set_mode(TOUCHSCREEN_POINT);
-        }
-        else if (button == BUTTON_RC_MODE)
-        {
-            printf("BUTTON");
-            touchscreen_set_mode(TOUCHSCREEN_BUTTON);
-        }
-#if 1
-        else if (button&BUTTON_TOUCHSCREEN)
-        {
-            if (button&BUTTON_REL)
-                continue;
-            unsigned int data = button_get_data();
-            int x = (data&0xffff0000)>>16, y = data&0x0000ffff;
-            reset_screen();
-            line = 9;
-            printf("BB: %x %d %d", button, x,y);
-            lcd_hline(x-5, x+5, y);
-            lcd_vline(x, y-5, y+5);
-            lcd_update();
-        }
-        else if (button == BUTTON_RC_PLAY)
-        {
-            reset_screen();
-        }
-            
-        else if (button)
-        {
-          //  if (button&BUTTON_REL)
-            {
-                printf("%08x %s\n", button, (button&BUTTON_REL)?"yes":"no");
-            }
-        }
-            
-#endif
-    }
-}
-#endif
-
 void main(void)
 {
     unsigned char* loadbuffer;
@@ -252,10 +111,6 @@ void main(void)
         lcd_update();
     }
     
-#if defined(MRDEBUG)
-    mrdebug();
-#endif
-
     sleep(50);
 
     printf("ATA");