| Index: apps/installer-nano2g/fsfiles |
| Property changes on: apps/installer-nano2g/fsfiles |
| ___________________________________________________________________ |
| Added: svn:ignore |
| ## -0,0 +1 ## |
| | 1 | +.rockbox |
| Index: umsboot/panic.c |
| — | — | @@ -32,9 +32,9 @@ |
| 33 | 33 | {
|
| 34 | 34 | enter_critical_section();
|
| 35 | 35 | while (!displaylcd_safe());
|
| 36 | | - lcdconsole_puts_noblit("\n*PANIC*\n", 0, -1);
|
| 37 | | - lcdconsole_puts_noblit(string, 0, -1);
|
| 38 | | - lcdconsole_puts_noblit("\n", 0, -1);
|
| | 36 | + lcdconsole_puts_noblit("\n*PANIC*\n", LCDCONSOLE_FGCOLOR, LCDCONSOLE_BGCOLOR);
|
| | 37 | + lcdconsole_puts_noblit(string, LCDCONSOLE_FGCOLOR, LCDCONSOLE_BGCOLOR);
|
| | 38 | + lcdconsole_puts_noblit("\n", LCDCONSOLE_FGCOLOR, LCDCONSOLE_BGCOLOR);
|
| 39 | 39 | lcdconsole_update();
|
| 40 | 40 | hang();
|
| 41 | 41 | }
|
| — | — | @@ -41,7 +41,7 @@ |
| 42 | 42 |
|
| 43 | 43 | static int pprfunc(void* ptr, unsigned char letter)
|
| 44 | 44 | {
|
| 45 | | - lcdconsole_putc_noblit(letter, 0, -1);
|
| | 45 | + lcdconsole_putc_noblit(letter, LCDCONSOLE_FGCOLOR, LCDCONSOLE_BGCOLOR);
|
| 46 | 46 | return true;
|
| 47 | 47 | }
|
| 48 | 48 |
|
| — | — | @@ -50,11 +50,11 @@ |
| 51 | 51 | va_list ap;
|
| 52 | 52 | enter_critical_section();
|
| 53 | 53 | while (!displaylcd_safe());
|
| 54 | | - lcdconsole_puts_noblit("\n*PANIC*\n", 0, -1);
|
| | 54 | + lcdconsole_puts_noblit("\n*PANIC*\n", LCDCONSOLE_FGCOLOR, LCDCONSOLE_BGCOLOR);
|
| 55 | 55 | va_start(ap, string);
|
| 56 | 56 | format(pprfunc, NULL, string, ap);
|
| 57 | 57 | va_end(ap);
|
| 58 | | - lcdconsole_puts_noblit("\n", 0, -1);
|
| | 58 | + lcdconsole_puts_noblit("\n", LCDCONSOLE_FGCOLOR, LCDCONSOLE_BGCOLOR);
|
| 59 | 59 | lcdconsole_update();
|
| 60 | 60 | hang();
|
| 61 | 61 | }
|
| Index: umsboot/target/ipodnano2g/target.h |
| — | — | @@ -49,6 +49,8 @@ |
| 50 | 50 | #define LCD_BYTESPERPIXEL 2
|
| 51 | 51 | #define FRAMEBUF_WIDTH 176
|
| 52 | 52 | #define FRAMEBUF_HEIGHT 132
|
| | 53 | +#define LCDCONSOLE_FGCOLOR 0
|
| | 54 | +#define LCDCONSOLE_BGCOLOR -1
|
| 53 | 55 |
|
| 54 | 56 | #define HAVE_BACKLIGHT
|
| 55 | 57 |
|
| Index: umsboot/target/ipodclassic/target.h |
| — | — | @@ -49,6 +49,8 @@ |
| 50 | 50 | #define LCD_BYTESPERPIXEL 2
|
| 51 | 51 | #define FRAMEBUF_WIDTH 176
|
| 52 | 52 | #define FRAMEBUF_HEIGHT 98
|
| | 53 | +#define LCDCONSOLE_FGCOLOR 0
|
| | 54 | +#define LCDCONSOLE_BGCOLOR -1
|
| 53 | 55 |
|
| 54 | 56 | #define HAVE_BACKLIGHT
|
| 55 | 57 |
|
| Index: umsboot/main.c |
| — | — | @@ -131,7 +131,7 @@ |
| 132 | 132 | while (vbus_state() && !usb_ejected);
|
| 133 | 133 | udelay(200000);
|
| 134 | 134 | usb_exit();
|
| 135 | | - lcdconsole_puts("\nLoading UBI file...\n", 0, 0xffff);
|
| | 135 | + lcdconsole_puts("\nLoading UBI file...\n", LCDCONSOLE_FGCOLOR, LCDCONSOLE_BGCOLOR);
|
| 136 | 136 | int found = 0;
|
| 137 | 137 | uint16_t cluster;
|
| 138 | 138 | uint32_t size;
|
| — | — | @@ -151,17 +151,17 @@ |
| 152 | 152 | + RAMDISK_SECTORSIZE - 1) / RAMDISK_SECTORSIZE;
|
| 153 | 153 | if (!found)
|
| 154 | 154 | {
|
| 155 | | - lcdconsole_puts("No UBI file found!", 0, 0xffff);
|
| | 155 | + lcdconsole_puts("No UBI file found!", LCDCONSOLE_FGCOLOR, LCDCONSOLE_BGCOLOR);
|
| 156 | 156 | return;
|
| 157 | 157 | }
|
| 158 | 158 | if (found != 1)
|
| 159 | 159 | {
|
| 160 | | - lcdconsole_puts("Multiple UBI files found!\nPlease copy exactly one.", 0, 0xffff);
|
| | 160 | + lcdconsole_puts("Multiple UBI files found!\nPlease copy exactly one.", LCDCONSOLE_FGCOLOR, LCDCONSOLE_BGCOLOR);
|
| 161 | 161 | return;
|
| 162 | 162 | }
|
| 163 | 163 | if (!size || !cluster)
|
| 164 | 164 | {
|
| 165 | | - lcdconsole_puts("UBI file is empty!", 0, 0xffff);
|
| | 165 | + lcdconsole_puts("UBI file is empty!", LCDCONSOLE_FGCOLOR, LCDCONSOLE_BGCOLOR);
|
| 166 | 166 | return;
|
| 167 | 167 | }
|
| 168 | 168 | uint16_t dest = 0;
|
| — | — | @@ -171,7 +171,7 @@ |
| 172 | 172 | cluster = *((uint16_t*)&ramdisk[swapmap[1 + (cluster / (RAMDISK_SECTORSIZE / 2))]]
|
| 173 | 173 | [(cluster % (RAMDISK_SECTORSIZE / 2)) * 2]);
|
| 174 | 174 | }
|
| 175 | | - lcdconsole_puts("Rearranging files...\n", 0, 0xffff);
|
| | 175 | + lcdconsole_puts("Rearranging files...\n", LCDCONSOLE_FGCOLOR, LCDCONSOLE_BGCOLOR);
|
| 176 | 176 | uint16_t offset = RAMDISK_SECTORS - totalclusters - 2;
|
| 177 | 177 | memset(newfat, 0, sizeof(newfat));
|
| 178 | 178 | memset(newdir, 0, sizeof(newdir));
|
| — | — | @@ -205,7 +205,7 @@ |
| 206 | 206 | memcpy(ramdisk[offset + 1], newdir, RAMDISK_SECTORSIZE);
|
| 207 | 207 | memcpy(ramdisk[offset - fatsectors + 1], newfat, fatsectors * RAMDISK_SECTORSIZE);
|
| 208 | 208 | fat16_write_mbr(_ramdiskptr, totalclusters + fatsectors + 2);
|
| 209 | | - lcdconsole_puts("Booting...", 0, 0xffff);
|
| | 209 | + lcdconsole_puts("Booting...", LCDCONSOLE_FGCOLOR, LCDCONSOLE_BGCOLOR);
|
| 210 | 210 | displaylcd_sync();
|
| 211 | 211 | udelay(10000);
|
| 212 | 212 | execfirmware(ramdisk[0]);
|
| — | — | @@ -229,7 +229,7 @@ |
| 230 | 230 | i2c_init();
|
| 231 | 231 | #endif
|
| 232 | 232 | power_init();
|
| 233 | | - lcdconsole_puts(welcomestring, 0, 0xffff);
|
| | 233 | + lcdconsole_puts(welcomestring, LCDCONSOLE_FGCOLOR, LCDCONSOLE_BGCOLOR);
|
| 234 | 234 | #ifdef HAVE_BACKLIGHT
|
| 235 | 235 | backlight_init();
|
| 236 | 236 | #endif
|
| Index: umsboot/lcdconsole.c |
| — | — | @@ -44,7 +44,7 @@ |
| 45 | 45 | void lcdconsole_init()
|
| 46 | 46 | {
|
| 47 | 47 | displaylcd(0, LCD_WIDTH - 1, 0, LCD_HEIGHT - 1, (void*)0xffffffff, 0);
|
| 48 | | - memset(framebuf, -1, sizeof(framebuf));
|
| | 48 | + memset(framebuf, LCDCONSOLE_BGCOLOR, sizeof(framebuf));
|
| 49 | 49 | current_row = 0;
|
| 50 | 50 | current_col = -1;
|
| 51 | 51 | lcdconsole_needs_update = false;
|
