summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2005-05-31 12:37:05 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2005-05-31 12:37:05 +0000
commit88f3a53b7ef9cc06dbceee4152421626008d9e73 (patch)
tree721526535f4eb96babe6c48f2ddd1839bd0036e2
parentd4c1464d155434b6f1d3d6cfff196d85fe3cbb6d (diff)
downloadrockbox-88f3a53b7ef9cc06dbceee4152421626008d9e73.tar.gz
rockbox-88f3a53b7ef9cc06dbceee4152421626008d9e73.zip
iRiver remote LCD is only 128x64
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6542 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/recorder/icons.c2
-rw-r--r--apps/recorder/icons.h2
-rw-r--r--firmware/drivers/lcd-h100-remote.c4
-rw-r--r--firmware/export/config-h100.h4
4 files changed, 6 insertions, 6 deletions
diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c
index 14d106142e..26e494e29d 100644
--- a/apps/recorder/icons.c
+++ b/apps/recorder/icons.c
@@ -80,7 +80,7 @@ const unsigned char bitmap_icon_disk[12] =
80 {0x15,0x3f,0x7d,0x7B,0x77,0x67,0x79,0x7b,0x57,0x4f,0x47,0x7f}; 80 {0x15,0x3f,0x7d,0x7B,0x77,0x67,0x79,0x7b,0x57,0x4f,0x47,0x7f};
81#endif 81#endif
82 82
83#if LCD_WIDTH == 112 || LCD_WIDTH == 128 || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_WIDTH == 134) 83#if LCD_WIDTH == 112 || LCD_WIDTH == 128 || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_WIDTH == 128)
84/* Archos Jukebox/ Ondio + Gmini LCD width / remote lcd of iriver*/ 84/* Archos Jukebox/ Ondio + Gmini LCD width / remote lcd of iriver*/
85 85
86const unsigned char rockbox112x37[]={ 86const unsigned char rockbox112x37[]={
diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h
index b0157308ce..d9d743a26c 100644
--- a/apps/recorder/icons.h
+++ b/apps/recorder/icons.h
@@ -67,7 +67,7 @@ extern const unsigned char bitmap_icons_7x8[Icon_Last][7];
67extern const unsigned char bitmap_icon_disk[]; 67extern const unsigned char bitmap_icon_disk[];
68#endif 68#endif
69 69
70#if LCD_WIDTH == 112 || LCD_WIDTH == 128 || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_WIDTH == 134) 70#if LCD_WIDTH == 112 || LCD_WIDTH == 128 || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_WIDTH == 128)
71extern const unsigned char rockbox112x37[]; 71extern const unsigned char rockbox112x37[];
72#endif 72#endif
73#if LCD_WIDTH == 160 73#if LCD_WIDTH == 160
diff --git a/firmware/drivers/lcd-h100-remote.c b/firmware/drivers/lcd-h100-remote.c
index 256934613a..c7c2f08167 100644
--- a/firmware/drivers/lcd-h100-remote.c
+++ b/firmware/drivers/lcd-h100-remote.c
@@ -390,7 +390,7 @@ void lcd_remote_update (void)
390 for (y = 0; y < LCD_REMOTE_HEIGHT / 8; y++) 390 for (y = 0; y < LCD_REMOTE_HEIGHT / 8; y++)
391 { 391 {
392 lcd_remote_write_command(LCD_REMOTE_CNTL_SET_PAGE_ADDRESS | y); 392 lcd_remote_write_command(LCD_REMOTE_CNTL_SET_PAGE_ADDRESS | y);
393 lcd_remote_write_command_ex(0x10, 0x00); 393 lcd_remote_write_command_ex(0x10, 0x04);
394 lcd_remote_write_data(lcd_remote_framebuffer[y], LCD_REMOTE_WIDTH); 394 lcd_remote_write_data(lcd_remote_framebuffer[y], LCD_REMOTE_WIDTH);
395 } 395 }
396} 396}
@@ -423,7 +423,7 @@ void lcd_remote_init(void)
423 423
424 sleep(1); 424 sleep(1);
425 425
426 lcd_remote_write_command(LCD_REMOTE_CNTL_INIT_LINE | 0x0); // init line 426 lcd_remote_write_command(LCD_REMOTE_CNTL_INIT_LINE | 0x1); // init line
427 lcd_remote_write_command(LCD_REMOTE_CNTL_SET_PAGE_ADDRESS | 0x0); // page address 427 lcd_remote_write_command(LCD_REMOTE_CNTL_SET_PAGE_ADDRESS | 0x0); // page address
428 lcd_remote_write_command_ex(0x10, 0x00); // Column MSB + LSB 428 lcd_remote_write_command_ex(0x10, 0x00); // Column MSB + LSB
429 429
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h
index 0044e28009..0052b7246f 100644
--- a/firmware/export/config-h100.h
+++ b/firmware/export/config-h100.h
@@ -9,8 +9,8 @@
9#define LCD_HEIGHT 128 9#define LCD_HEIGHT 128
10 10
11/* remote LCD */ 11/* remote LCD */
12#define LCD_REMOTE_WIDTH 134 12#define LCD_REMOTE_WIDTH 128
13#define LCD_REMOTE_HEIGHT 65 13#define LCD_REMOTE_HEIGHT 64
14 14
15#define CONFIG_KEYPAD IRIVER_H100_PAD 15#define CONFIG_KEYPAD IRIVER_H100_PAD
16 16