summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2008-04-02 22:42:21 +0000
committerJens Arnold <amiconn@rockbox.org>2008-04-02 22:42:21 +0000
commit01a106dbfa51127d60ed4404e75f005d58738939 (patch)
tree5024c3e4712b7359804429801c098c2a4fdb5d0d /firmware
parentd5f37b2235eee14041f538f3344e0f80bb73fe87 (diff)
downloadrockbox-01a106dbfa51127d60ed4404e75f005d58738939.tar.gz
rockbox-01a106dbfa51127d60ed4404e75f005d58738939.tar.bz2
rockbox-01a106dbfa51127d60ed4404e75f005d58738939.zip
Make the measured LCD scanrates from the greylib known to the scanrate test plugin.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16938 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/config-player.h2
-rw-r--r--firmware/export/id3.h1
-rw-r--r--firmware/id3.c3
-rw-r--r--firmware/target/arm/iriver/h10/lcd-h10_5gb.c114
4 files changed, 44 insertions, 76 deletions
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h
index 94d5edf451..26a643f152 100644
--- a/firmware/export/config-player.h
+++ b/firmware/export/config-player.h
@@ -49,7 +49,7 @@
/* Uncomment this if you want to enable ATA power-off control.
* Attention, some players crash when ATA power-off is enabled! */
-//#define HAVE_ATA_POWER_OFF
+#define HAVE_ATA_POWER_OFF
/* Define this if you control ata power player style
(with PB4, new player only) */
diff --git a/firmware/export/id3.h b/firmware/export/id3.h
index 8b2d02ea30..3145ee7225 100644
--- a/firmware/export/id3.h
+++ b/firmware/export/id3.h
@@ -49,6 +49,7 @@ enum
AFMT_WAVPACK, /* WavPack */
AFMT_ALAC, /* Apple Lossless Audio Codec */
AFMT_AAC, /* Advanced Audio Coding (AAC) in M4A container */
+ AFMT_MOD, /* MOD File Format */
AFMT_SHN, /* Shorten */
AFMT_SID, /* SID File Format */
AFMT_ADX, /* ADX File Format */
diff --git a/firmware/id3.c b/firmware/id3.c
index d63acbb8aa..c750fff521 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -90,6 +90,9 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] =
[AFMT_AAC] =
AFMT_ENTRY("AAC", "aac", NULL, "mp4\0" ),
/* Shorten */
+ [AFMT_MOD] =
+ AFMT_ENTRY("MOD", "mod", NULL, "mod\0" ),
+ /* Shorten */
[AFMT_SHN] =
AFMT_ENTRY("SHN", "shorten", NULL, "shn\0" ),
/* SID File Format */
diff --git a/firmware/target/arm/iriver/h10/lcd-h10_5gb.c b/firmware/target/arm/iriver/h10/lcd-h10_5gb.c
index 5b022e09c5..669654f5c3 100644
--- a/firmware/target/arm/iriver/h10/lcd-h10_5gb.c
+++ b/firmware/target/arm/iriver/h10/lcd-h10_5gb.c
@@ -108,6 +108,7 @@ void lcd_init_device(void)
{
CLCD_CLOCK_SRC |= 0xc0000000; /* Set LCD interface clock to PLL */
/* H10 LCD is initialised by the bootloader */
+ lcd_write_reg(R_ENTRY_MODE, 0x1030); /* BGR =1, ID1 = 1, ID0 = 1 */
}
/*** update functions ***/
@@ -275,88 +276,51 @@ void lcd_blit_yuv(unsigned char * const src[3],
/* Update a fraction of the display. */
-void lcd_update_rect(int x0, int y0, int width, int height)
+void lcd_update_rect(int x, int y, int width, int height)
{
- int x1, y1;
- int newx,newwidth;
- unsigned long *addr;
+ const fb_data *addr;
+ int bytes_to_write;
+
+ if (x + width >= LCD_WIDTH)
+ width = LCD_WIDTH - x;
+ if (y + height >= LCD_HEIGHT)
+ height = LCD_HEIGHT - y;
+
+ if ((width <= 0) || (height <= 0))
+ return; /* Nothing left to do. 0 would hang the transfer. */
+
+ /* Ensure x and width are both even, so we can read
+ * 32-bit aligned data from the framebuffer */
+ width = (width + (x & 1) + 1) & ~1;
+ x &= ~1;
+
+ lcd_write_reg(R_VERT_RAM_ADDR_POS, (LCD_HEIGHT-1) << 8);
+ lcd_write_reg(R_HORIZ_RAM_ADDR_POS, ((x + width - 1) << 8) | x);
+ lcd_write_reg(R_RAM_ADDR_SET, (y << 8) | x);
- /* Ensure x and width are both even - so we can read 32-bit aligned
- data from lcd_framebuffer */
- newx=x0&~1;
- newwidth=width&~1;
- if (newx+newwidth < x0+width) { newwidth+=2; }
- x0=newx; width=newwidth;
-
- /* calculate the drawing region */
- y1 = (y0 + height) - 1; /* max vert */
- x1 = (x0 + width) - 1; /* max horiz */
-
-
- /* swap max horiz < start horiz */
- if (y1 < y0) {
- int t;
- t = y0;
- y0 = y1;
- y1 = t;
- }
-
- /* swap max vert < start vert */
- if (x1 < x0) {
- int t;
- t = x0;
- x0 = x1;
- x1 = t;
- }
-
- /* max horiz << 8 | start horiz */
- lcd_write_reg(R_HORIZ_RAM_ADDR_POS, (x1 << 8) | x0);
-
- /* max vert << 8 | start vert */
- lcd_write_reg(R_VERT_RAM_ADDR_POS, (y1 << 8) | y0);
-
- /* start vert << 8 | start horiz */
- lcd_write_reg(R_RAM_ADDR_SET, (y0 << 8) | x0);
-
- /* start drawing */
lcd_send_cmd(R_WRITE_DATA_2_GRAM);
- addr = (unsigned long*)&lcd_framebuffer[y0][x0];
-
- while (height > 0) {
- int c, r;
- int h, pixels_to_write;
-
- pixels_to_write = (width * height) * 2;
- h = height;
-
- /* calculate how much we can do in one go */
- if (pixels_to_write > 0x10000) {
- h = (0x10000/2) / width;
- pixels_to_write = (width * h) * 2;
- }
-
- LCD2_BLOCK_CTRL = 0x10000080;
- LCD2_BLOCK_CONFIG = 0xc0010000 | (pixels_to_write - 1);
- LCD2_BLOCK_CTRL = 0x34000000;
+ addr = &lcd_framebuffer[y][x];
+ bytes_to_write = width * height * sizeof(fb_data);
+ /* must be <= 0x10000, but that's guaranteed on H10. */
- /* for each row */
- for (r = 0; r < h; r++) {
- /* for each column */
- for (c = 0; c < width; c += 2) {
- while (!(LCD2_BLOCK_CTRL & LCD2_BLOCK_TXOK));
-
- /* output 2 pixels */
- LCD2_BLOCK_DATA = *addr++;
- }
- addr += (LCD_WIDTH - width)/2;
+ LCD2_BLOCK_CTRL = 0x10000080;
+ LCD2_BLOCK_CONFIG = 0xc0010000 | (bytes_to_write - 1);
+ LCD2_BLOCK_CTRL = 0x34000000;
+
+ do
+ {
+ int w = width >> 1;
+ do
+ {
+ while (!(LCD2_BLOCK_CTRL & LCD2_BLOCK_TXOK));
+ LCD2_BLOCK_DATA = *(unsigned long*)addr; /* output 2 pixels */
+ addr += 2;
}
-
- while (!(LCD2_BLOCK_CTRL & LCD2_BLOCK_READY));
- LCD2_BLOCK_CONFIG = 0;
-
- height -= h;
+ while (--w > 0);
+ addr += LCD_WIDTH - width;
}
+ while (--height > 0);
}
/* Update the display.