1 files changed, 3 insertions, 227 deletions

diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-1bit-vert.c
index 5c4a0352a7..6ae92af72b 100644..100755
--- a/firmware/drivers/lcd-recorder.c
+++ b/firmware/drivers/lcd-1bit-vert.c
@@ -33,47 +33,7 @@
 
 /*** definitions ***/
 
-#define LCD_SET_LOWER_COLUMN_ADDRESS              ((char)0x00)
-#define LCD_SET_HIGHER_COLUMN_ADDRESS             ((char)0x10)
-#define LCD_SET_INTERNAL_REGULATOR_RESISTOR_RATIO ((char)0x20)
-#define LCD_SET_POWER_CONTROL_REGISTER            ((char)0x28)
-#define LCD_SET_DISPLAY_START_LINE                ((char)0x40)
-#define LCD_SET_CONTRAST_CONTROL_REGISTER         ((char)0x81)
-#define LCD_SET_SEGMENT_REMAP                     ((char)0xA0)
-#define LCD_SET_LCD_BIAS                          ((char)0xA2)
-#define LCD_SET_ENTIRE_DISPLAY_OFF                ((char)0xA4)
-#define LCD_SET_ENTIRE_DISPLAY_ON                 ((char)0xA5)
-#define LCD_SET_NORMAL_DISPLAY                    ((char)0xA6)
-#define LCD_SET_REVERSE_DISPLAY                   ((char)0xA7)
-#define LCD_SET_MULTIPLEX_RATIO                   ((char)0xA8)
-#define LCD_SET_BIAS_TC_OSC                       ((char)0xA9)
-#define LCD_SET_1OVER4_BIAS_RATIO                 ((char)0xAA)
-#define LCD_SET_INDICATOR_OFF                     ((char)0xAC)
-#define LCD_SET_INDICATOR_ON                      ((char)0xAD)
-#define LCD_SET_DISPLAY_OFF                       ((char)0xAE)
-#define LCD_SET_DISPLAY_ON                        ((char)0xAF)
-#define LCD_SET_PAGE_ADDRESS                      ((char)0xB0)
-#define LCD_SET_COM_OUTPUT_SCAN_DIRECTION         ((char)0xC0)
-#define LCD_SET_TOTAL_FRAME_PHASES                ((char)0xD2)
-#define LCD_SET_DISPLAY_OFFSET                    ((char)0xD3)
-#define LCD_SET_READ_MODIFY_WRITE_MODE            ((char)0xE0)
-#define LCD_SOFTWARE_RESET                        ((char)0xE2)
-#define LCD_NOP                                   ((char)0xE3)
-#define LCD_SET_END_OF_READ_MODIFY_WRITE_MODE     ((char)0xEE)
-
-/* LCD command codes */
-#define LCD_CNTL_RESET          0xe2    /* Software reset */
-#define LCD_CNTL_POWER          0x2f    /* Power control */
-#define LCD_CNTL_CONTRAST       0x81    /* Contrast */
-#define LCD_CNTL_OUTSCAN        0xc8    /* Output scan direction */
-#define LCD_CNTL_SEGREMAP       0xa1    /* Segment remap */
-#define LCD_CNTL_DISPON         0xaf    /* Display on */
-
-#define LCD_CNTL_PAGE           0xb0    /* Page address */
-#define LCD_CNTL_HIGHCOL        0x10    /* Upper column address */
-#define LCD_CNTL_LOWCOL         0x00    /* Lower column address */
-
-#define SCROLLABLE_LINES 13
+#define SCROLLABLE_LINES ((LCD_HEIGHT+4)/5 < 32 ? (LCD_HEIGHT+4)/5 : 32)
 
 /*** globals ***/
 
@@ -83,9 +43,6 @@ static int drawmode = DRMODE_SOLID;
 static int xmargin = 0;
 static int ymargin = 0;
 static int curfont = FONT_SYSFIXED;
-#ifndef SIMULATOR
-static int xoffset; /* needed for flip */
-#endif
 
 /* scrolling */
 static volatile int scrolling_lines=0; /* Bitpattern of which lines are scrolling */
@@ -104,197 +61,16 @@ static const char scroll_tick_table[16] = {
     100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3
 };
 
-/*** driver routines ***/
-
-/* optimised archos recorder code is in lcd.S */
-
-#if CONFIG_CPU == PNX0101
-
-void lcd_write_command(int cmd)
-{
-    while ((LCDSTAT & 3) != 3);
-    LCDCMD = cmd;
-}
-
-void lcd_write_data( const unsigned char* data, int count )
-{
-    int i;
-    for (i=0; i < count; i++) {
-        while ((LCDSTAT & 3) != 3);
-        LCDDATA = data[i];
-    }
-}
-
-#endif
-
-/*** hardware configuration ***/
-
-#ifndef SIMULATOR
-
-int lcd_default_contrast(void)
-{
-#if CONFIG_LCD == LCD_IFP7XX
-    return 45;
-#else
-    return (read_hw_mask() & LCD_CONTRAST_BIAS) ? 31 : 49;
-#endif
-}
-
-void lcd_set_contrast(int val)
-{
-    lcd_write_command(LCD_CNTL_CONTRAST);
-    lcd_write_command(val);
-}
-
-void lcd_set_invert_display(bool yesno)
-{
-    if (yesno) 
-        lcd_write_command(LCD_SET_REVERSE_DISPLAY);
-    else 
-        lcd_write_command(LCD_SET_NORMAL_DISPLAY);
-}
-
-/* turn the display upside down (call lcd_update() afterwards) */
-void lcd_set_flip(bool yesno)
-{
-#ifdef HAVE_DISPLAY_FLIPPED
-    if (!yesno) 
-#else
-    if (yesno) 
-#endif
-    {
-        lcd_write_command(LCD_SET_SEGMENT_REMAP);
-        lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION);
-        xoffset = 132 - LCD_WIDTH; /* 132 colums minus the 112 we have */
-    }
-    else 
-    {
-        lcd_write_command(LCD_SET_SEGMENT_REMAP | 0x01);
-        lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION | 0x08);
-#if CONFIG_LCD == LCD_IFP7XX
-        xoffset = 4;
-#else
-        xoffset = 0;
-#endif
-    }
-}
-
-#endif /* !SIMULATOR */
-
 /* LCD init */
-#ifdef SIMULATOR
-
 void lcd_init(void)
 {
-    create_thread(scroll_thread, scroll_stack,
-                  sizeof(scroll_stack), scroll_name IF_PRIO(, PRIORITY_USER_INTERFACE));
-}
-#else
-
-void lcd_init(void)
-{
-#if CONFIG_CPU == PNX0101
-    LCDREG10 = 0xf;
-    LCDREG04 = 0x4084;
-#else
-    /* Initialize PB0-3 as output pins */
-    PBCR2 &= 0xff00; /* MD = 00 */
-    PBIOR |= 0x000f; /* IOR = 1 */
-#endif
-
-    /* inits like the original firmware */
-    lcd_write_command(LCD_SOFTWARE_RESET);
-    lcd_write_command(LCD_SET_INTERNAL_REGULATOR_RESISTOR_RATIO + 4);
-#if CONFIG_LCD == LCD_IFP7XX
-    lcd_write_command(LCD_SET_LCD_BIAS);
-#else
-    lcd_write_command(LCD_SET_1OVER4_BIAS_RATIO + 0); /* force 1/4 bias: 0 */
-#endif
-    lcd_write_command(LCD_SET_POWER_CONTROL_REGISTER + 7); 
-               /* power control register: op-amp=1, regulator=1, booster=1 */
-    lcd_write_command(LCD_SET_DISPLAY_ON);
-    lcd_write_command(LCD_SET_NORMAL_DISPLAY);
-    lcd_set_flip(false);
-    lcd_write_command(LCD_SET_DISPLAY_START_LINE + 0);
-    lcd_set_contrast(lcd_default_contrast());
-    lcd_write_command(LCD_SET_PAGE_ADDRESS);
-    lcd_write_command(LCD_SET_LOWER_COLUMN_ADDRESS + 0);
-    lcd_write_command(LCD_SET_HIGHER_COLUMN_ADDRESS + 0);
-
     lcd_clear_display();
-    lcd_update();
-
+    /* Call device specific init */
+    lcd_init_device();
     create_thread(scroll_thread, scroll_stack,
                   sizeof(scroll_stack), scroll_name IF_PRIO(, PRIORITY_USER_INTERFACE));
 }
 
-/*** Update functions ***/
-
-/* Performance function that works with an external buffer
-   note that by and bheight are in 8-pixel units! */
-void lcd_blit(const unsigned char* data, int x, int by, int width,
-              int bheight, int stride)
-{
-    /* Copy display bitmap to hardware */
-    while (bheight--)
-    {
-        lcd_write_command (LCD_CNTL_PAGE | (by++ & 0xf));
-        lcd_write_command (LCD_CNTL_HIGHCOL | (((x+xoffset)>>4) & 0xf));
-        lcd_write_command (LCD_CNTL_LOWCOL | ((x+xoffset) & 0xf));
-
-        lcd_write_data(data, width);
-        data += stride;
-    }
-}
-
-
-/* Update the display.
-   This must be called after all other LCD functions that change the display. */
-void lcd_update(void) ICODE_ATTR;
-void lcd_update(void)
-{
-    int y;
-
-    /* Copy display bitmap to hardware */
-    for (y = 0; y < LCD_HEIGHT/8; y++)
-    {
-        lcd_write_command (LCD_CNTL_PAGE | (y & 0xf));
-        lcd_write_command (LCD_CNTL_HIGHCOL | ((xoffset >> 4) & 0xf));
-        lcd_write_command (LCD_CNTL_LOWCOL | (xoffset & 0xf));
-
-        lcd_write_data (lcd_framebuffer[y], LCD_WIDTH);
-    }
-}
-
-/* Update a fraction of the display. */
-void lcd_update_rect(int, int, int, int) ICODE_ATTR;
-void lcd_update_rect(int x, int y, int width, int height)
-{
-    int ymax;
-
-    /* The Y coordinates have to work on even 8 pixel rows */
-    ymax = (y + height-1) >> 3;
-    y >>= 3;
-
-    if(x + width > LCD_WIDTH)
-        width = LCD_WIDTH - x;
-    if (width <= 0)
-        return; /* nothing left to do, 0 is harmful to lcd_write_data() */
-    if(ymax >= LCD_HEIGHT/8)
-        ymax = LCD_HEIGHT/8-1;
-
-    /* Copy specified rectange bitmap to hardware */
-    for (; y <= ymax; y++)
-    {
-        lcd_write_command (LCD_CNTL_PAGE | (y & 0xf));
-        lcd_write_command (LCD_CNTL_HIGHCOL | (((x+xoffset) >> 4) & 0xf));
-        lcd_write_command (LCD_CNTL_LOWCOL | ((x+xoffset) & 0xf));
-
-        lcd_write_data (&lcd_framebuffer[y][x], width);
-    }
-}
-#endif /* !SIMULATOR */
-
 /*** parameter handling ***/
 
 void lcd_set_drawmode(int mode)