len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 13:15:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove tabs

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28719 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2010-12-01 18:35:01 +00:00
parent db9445abd7
commit 1b093cf297
4 changed files with 66 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/codecs/libmad/synth_full_arm.S
View file

@ -70,7 +70,7 @@ synth_full_odd_sbsample:
ldmia r1!, {r11, r12, sp, lr} ldmia r1!, {r11, r12, sp, lr}
smlal r6, r7, r11, r10 smlal r6, r7, r11, r10
ldr r10, [r4, #88] /*;;1 cycle stall on arm9, but we free up r11*/ ldr r10, [r4, #88] /*;;1 cycle stall on arm9, but we free up r11*/
smlal r8, r9, r11, r10 smlal r8, r9, r11, r10
ldr r10, [r3, #28] ldr r10, [r3, #28]
@ -89,12 +89,12 @@ synth_full_odd_sbsample:
rsbs r6, r6, #0 rsbs r6, r6, #0
rsc r7, r7, #0 rsc r7, r7, #0
/* ;; PROD_A and even half of SB_SAMPLE*/ /* ;; PROD_A and even half of SB_SAMPLE*/
ldr r10, [r3, #0] ldr r10, [r3, #0]
ldmia r2!, {r11, r12, sp, lr} ldmia r2!, {r11, r12, sp, lr}
smlal r6, r7, r11, r10 smlal r6, r7, r11, r10
ldr r10, [r4, #60] /*;;1 cycle stall on arm9, but we free up r11*/ ldr r10, [r4, #60] /*;;1 cycle stall on arm9, but we free up r11*/
smlal r8, r9, r11, r10 smlal r8, r9, r11, r10
ldr r11, [r3, #56] ldr r11, [r3, #56]
ldr r10, [r3, #48] ldr r10, [r3, #48]
@ -113,7 +113,7 @@ synth_full_odd_sbsample:
ldmia r2!, {r11, r12, sp, lr} ldmia r2!, {r11, r12, sp, lr}
smlal r6, r7, r11, r10 smlal r6, r7, r11, r10
ldr r10, [r4, #92] /*;;1 cycle stall on arm9, but we free up r11*/ ldr r10, [r4, #92] /*;;1 cycle stall on arm9, but we free up r11*/
smlal r8, r9, r11, r10 smlal r8, r9, r11, r10
ldr r10, [r3, #24] ldr r10, [r3, #24]
@ -199,7 +199,7 @@ synth_full_even_sbsample:
ldr r10, [r3, #4] ldr r10, [r3, #4]
ldmia r2!, {r11, r12, sp, lr} ldmia r2!, {r11, r12, sp, lr}
smlal r6, r7, r11, r10 smlal r6, r7, r11, r10
ldr r10, [r4, #120] /*;;1 cycle stall on arm9, but we free up r11*/ ldr r10, [r4, #120] /*;;1 cycle stall on arm9, but we free up r11*/
smlal r8, r9, r11, r10 smlal r8, r9, r11, r10
ldr r10, [r3, #60] ldr r10, [r3, #60]
ldr r11, [r3, #52] ldr r11, [r3, #52]
@ -219,7 +219,7 @@ synth_full_even_sbsample:
ldr r10, [r3, #36] ldr r10, [r3, #36]
ldmia r2!, {r11, r12, sp, lr} ldmia r2!, {r11, r12, sp, lr}
smlal r6, r7, r11, r10 smlal r6, r7, r11, r10
ldr r10, [r4, #88] /*;;1 cycle stall on arm9, but we free up r11*/ ldr r10, [r4, #88] /*;;1 cycle stall on arm9, but we free up r11*/
smlal r8, r9, r11, r10 smlal r8, r9, r11, r10
ldr r10, [r3, #28] ldr r10, [r3, #28]

2
firmware/target/arm/s5l8700/debug-s5l8700.c
View file

@ -56,7 +56,7 @@ bool __dbg_hw_info(void)
for(i=0;i<4;i++) for(i=0;i<4;i++)
{ {
nand_devicetype[i] = nand_get_device_type(i); nand_devicetype[i] = nand_get_device_type(i);
if(nand_devicetype[i] != NULL) nand_bank_count++; if(nand_devicetype[i] != NULL) nand_bank_count++;
} }
#endif #endif

60
firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c
View file

@ -687,11 +687,11 @@ static uint32_t ftl_vfl_get_physical_block(uint32_t bank, uint32_t block)
uint32_t spareused = ftl_vfl_cxt[bank].spareused; uint32_t spareused = ftl_vfl_cxt[bank].spareused;
for (spareindex = 0; spareindex < spareused; spareindex++) for (spareindex = 0; spareindex < spareused; spareindex++)
if (ftl_vfl_cxt[bank].remaptable[spareindex] == block) if (ftl_vfl_cxt[bank].remaptable[spareindex] == block)
{ {
DEBUGF("FTL: VFL: Following remapped block: %d => %d\n", DEBUGF("FTL: VFL: Following remapped block: %d => %d\n",
block, ftl_vfl_cxt[bank].firstspare + spareindex); block, ftl_vfl_cxt[bank].firstspare + spareindex);
return ftl_vfl_cxt[bank].firstspare + spareindex; return ftl_vfl_cxt[bank].firstspare + spareindex;
} }
return block; return block;
} }
@ -881,10 +881,10 @@ static uint32_t ftl_vfl_read_fast(uint32_t vpage, void* buffer, void* sparebuffe
uint32_t i, rc = 0; uint32_t i, rc = 0;
uint32_t abspage = vpage + ppb * syshyperblocks; uint32_t abspage = vpage + ppb * syshyperblocks;
if (abspage + ftl_banks - 1 >= ftl_nand_type->blocks * ppb || abspage < ppb) if (abspage + ftl_banks - 1 >= ftl_nand_type->blocks * ppb || abspage < ppb)
{ {
DEBUGF("FTL: Trying to read out-of-bounds vPage %u\n", (unsigned)vpage); DEBUGF("FTL: Trying to read out-of-bounds vPage %u\n", (unsigned)vpage);
return 4; return 4;
} }
uint32_t bank = abspage % ftl_banks; uint32_t bank = abspage % ftl_banks;
uint32_t block = abspage / (ftl_nand_type->pagesperblock * ftl_banks); uint32_t block = abspage / (ftl_nand_type->pagesperblock * ftl_banks);
@ -954,11 +954,11 @@ static uint32_t ftl_vfl_write(uint32_t vpage, uint32_t count,
uint32_t abspage = vpage + ppb * syshyperblocks; uint32_t abspage = vpage + ppb * syshyperblocks;
if (abspage + count > ftl_nand_type->blocks * ppb || abspage < ppb) if (abspage + count > ftl_nand_type->blocks * ppb || abspage < ppb)
{ {
DEBUGF("FTL: Trying to write out-of-bounds vPage %u\n", DEBUGF("FTL: Trying to write out-of-bounds vPage %u\n",
(unsigned)vpage); (unsigned)vpage);
return 4; return 4;
} }
static uint32_t bank[5]; static uint32_t bank[5];
static uint32_t block[5]; static uint32_t block[5];
@ -1065,11 +1065,11 @@ static uint32_t ftl_vfl_open(void)
vflcxtidx = k; vflcxtidx = k;
} }
if (vflcxtidx == 4) if (vflcxtidx == 4)
{ {
DEBUGF("FTL: No VFL CXT block found on bank %u!\n", DEBUGF("FTL: No VFL CXT block found on bank %u!\n",
(unsigned)i); (unsigned)i);
return 1; return 1;
} }
last = 0; last = 0;
uint32_t max = ftl_nand_type->pagesperblock; uint32_t max = ftl_nand_type->pagesperblock;
for (k = 8; k < max; k += 8) for (k = 8; k < max; k += 8)
@ -1096,10 +1096,10 @@ static uint32_t ftl_vfl_open(void)
} }
} }
else else
{ {
DEBUGF("FTL: Couldn't load bank %u lowlevel BBT!\n", (unsigned)i); DEBUGF("FTL: Couldn't load bank %u lowlevel BBT!\n", (unsigned)i);
return 1; return 1;
} }
cxt = ftl_vfl_get_newest_cxt(); cxt = ftl_vfl_get_newest_cxt();
for (i = 0; i < ftl_banks; i++) for (i = 0; i < ftl_banks; i++)
memcpy(ftl_vfl_cxt[i].ftlctrlblocks, cxt->ftlctrlblocks, 6); memcpy(ftl_vfl_cxt[i].ftlctrlblocks, cxt->ftlctrlblocks, 6);
@ -1160,10 +1160,10 @@ static uint32_t ftl_open(void)
} }
if (ftlcxtfound == 0) if (ftlcxtfound == 0)
{ {
DEBUGF("FTL: Couldn't find FTL CXT page!\n"); DEBUGF("FTL: Couldn't find FTL CXT page!\n");
return 1; return 1;
} }
DEBUGF("FTL: Successfully read FTL context block\n"); DEBUGF("FTL: Successfully read FTL context block\n");
uint32_t pagestoread = ftl_nand_type->userblocks >> 10; uint32_t pagestoread = ftl_nand_type->userblocks >> 10;
@ -1173,10 +1173,10 @@ static uint32_t ftl_open(void)
{ {
if ((ftl_vfl_read(ftl_cxt.ftl_map_pages[i], if ((ftl_vfl_read(ftl_cxt.ftl_map_pages[i],
ftl_buffer, &ftl_sparebuffer[0], 1, 1) & 0x11F) != 0) ftl_buffer, &ftl_sparebuffer[0], 1, 1) & 0x11F) != 0)
{ {
DEBUGF("FTL: Failed to read block map page %u\n", (unsigned)i); DEBUGF("FTL: Failed to read block map page %u\n", (unsigned)i);
return 1; return 1;
} }
uint32_t toread = 2048; uint32_t toread = 2048;
if (toread > (ftl_nand_type->userblocks << 1) - (i << 11)) if (toread > (ftl_nand_type->userblocks << 1) - (i << 11))
@ -1193,10 +1193,10 @@ static uint32_t ftl_open(void)
{ {
if ((ftl_vfl_read(ftl_cxt.ftl_erasectr_pages[i], if ((ftl_vfl_read(ftl_cxt.ftl_erasectr_pages[i],
ftl_buffer, &ftl_sparebuffer[0], 1, 1) & 0x11F) != 0) ftl_buffer, &ftl_sparebuffer[0], 1, 1) & 0x11F) != 0)
{ {
DEBUGF("FTL: Failed to read erase counter page %u\n", (unsigned)i); DEBUGF("FTL: Failed to read erase counter page %u\n", (unsigned)i);
return 1; return 1;
} }
uint32_t toread = 2048; uint32_t toread = 2048;
if (toread > ((ftl_nand_type->userblocks + 23) << 1) - (i << 11)) if (toread > ((ftl_nand_type->userblocks + 23) << 1) - (i << 11))
@ -1301,14 +1301,14 @@ uint32_t ftl_read(uint32_t sector, uint32_t count, void* buffer)
if (logentry != NULL) if (logentry != NULL)
{ {
#ifdef FTL_TRACE #ifdef FTL_TRACE
DEBUGF("FTL: Block %d has a log entry\n", block); DEBUGF("FTL: Block %d has a log entry\n", block);
#endif #endif
if (logentry->scatteredvblock != 0xFFFF if (logentry->scatteredvblock != 0xFFFF
&& logentry->pageoffsets[page] != 0xFFFF) && logentry->pageoffsets[page] != 0xFFFF)
{ {
#ifdef FTL_TRACE #ifdef FTL_TRACE
DEBUGF("FTL: Found page %d at block %d, page %d\n", page, DEBUGF("FTL: Found page %d at block %d, page %d\n", page,
(*logentry).scatteredvblock, (*logentry).pageoffsets[page]); (*logentry).scatteredvblock, (*logentry).pageoffsets[page]);
#endif #endif
abspage = logentry->scatteredvblock * ppb abspage = logentry->scatteredvblock * ppb
+ logentry->pageoffsets[page]; + logentry->pageoffsets[page];
@ -1330,7 +1330,7 @@ uint32_t ftl_read(uint32_t sector, uint32_t count, void* buffer)
memset(&((uint8_t*)buffer)[(i + j) << 11], 0, 0x800); memset(&((uint8_t*)buffer)[(i + j) << 11], 0, 0x800);
else if ((ret & (0xd << (j << 2))) || ftl_sparebuffer[j].user.eccmark != 0xFF) else if ((ret & (0xd << (j << 2))) || ftl_sparebuffer[j].user.eccmark != 0xFF)
{ {
DEBUGF("FTL: Error while reading sector %d!\n", (sector + i)); DEBUGF("FTL: Error while reading sector %d!\n", (sector + i));
error = -3; error = -3;
memset(&((uint8_t*)buffer)[(i + j) << 11], 0, 0x800); memset(&((uint8_t*)buffer)[(i + j) << 11], 0, 0x800);
} }
@ -1343,7 +1343,7 @@ uint32_t ftl_read(uint32_t sector, uint32_t count, void* buffer)
if (ret & 2) memset(&((uint8_t*)buffer)[i << 11], 0, 0x800); if (ret & 2) memset(&((uint8_t*)buffer)[i << 11], 0, 0x800);
else if ((ret & 0x11D) != 0 || ftl_sparebuffer[0].user.eccmark != 0xFF) else if ((ret & 0x11D) != 0 || ftl_sparebuffer[0].user.eccmark != 0xFF)
{ {
DEBUGF("FTL: Error while reading sector %d!\n", (sector + i)); DEBUGF("FTL: Error while reading sector %d!\n", (sector + i));
error = -4; error = -4;
memset(&((uint8_t*)buffer)[i << 11], 0, 0x800); memset(&((uint8_t*)buffer)[i << 11], 0, 0x800);
} }
@ -1944,7 +1944,7 @@ uint32_t ftl_write(uint32_t sector, uint32_t count, const void* buffer)
{ {
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
DEBUGF("FTL: Marking dirty, try %d\n", i); DEBUGF("FTL: Marking dirty, try %d\n", i);
if (ftl_next_ctrl_pool_page() != 0) if (ftl_next_ctrl_pool_page() != 0)
{ {
mutex_unlock(&ftl_mtx); mutex_unlock(&ftl_mtx);
@ -1963,7 +1963,7 @@ uint32_t ftl_write(uint32_t sector, uint32_t count, const void* buffer)
mutex_unlock(&ftl_mtx); mutex_unlock(&ftl_mtx);
return -4; return -4;
} }
DEBUGF("FTL: Wrote dirty mark to %d\n", ftl_cxt.ftlctrlpage); DEBUGF("FTL: Wrote dirty mark to %d\n", ftl_cxt.ftlctrlpage);
ftl_cxt.clean_flag = 0; ftl_cxt.clean_flag = 0;
} }
@ -1981,14 +1981,14 @@ uint32_t ftl_write(uint32_t sector, uint32_t count, const void* buffer)
if (page == 0 && count - i >= ppb) if (page == 0 && count - i >= ppb)
{ {
#ifdef FTL_TRACE #ifdef FTL_TRACE
DEBUGF("FTL: Going to write a full hyperblock in one shot\n"); DEBUGF("FTL: Going to write a full hyperblock in one shot\n");
#endif #endif
uint32_t vblock = logentry->scatteredvblock; uint32_t vblock = logentry->scatteredvblock;
logentry->scatteredvblock = 0xFFFF; logentry->scatteredvblock = 0xFFFF;
if (logentry->pagesused != 0) if (logentry->pagesused != 0)
{ {
#ifdef FTL_TRACE #ifdef FTL_TRACE
DEBUGF("FTL: Scattered block had some pages already used, committing\n"); DEBUGF("FTL: Scattered block had some pages already used, committing\n");
#endif #endif
ftl_release_pool_block(vblock); ftl_release_pool_block(vblock);
vblock = ftl_allocate_pool_block(); vblock = ftl_allocate_pool_block();
@ -2030,7 +2030,7 @@ uint32_t ftl_write(uint32_t sector, uint32_t count, const void* buffer)
if (logentry->pagesused == ppb) if (logentry->pagesused == ppb)
{ {
#ifdef FTL_TRACE #ifdef FTL_TRACE
DEBUGF("FTL: Scattered block is full, committing\n"); DEBUGF("FTL: Scattered block is full, committing\n");
#endif #endif
ftl_remove_scattered_block(logentry); ftl_remove_scattered_block(logentry);
logentry = ftl_allocate_log_entry(block); logentry = ftl_allocate_log_entry(block);
@ -2164,7 +2164,7 @@ uint32_t ftl_init(void)
if (!ftl_has_devinfo()) if (!ftl_has_devinfo())
{ {
DEBUGF("FTL: No DEVICEINFO found!\n"); DEBUGF("FTL: No DEVICEINFO found!\n");
return -1; return -1;
} }
if (ftl_vfl_open() == 0) if (ftl_vfl_open() == 0)

50
firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c
View file

@ -66,11 +66,11 @@ static bool lcd_ispowered;
#ifdef HAVE_LCD_SLEEP #ifdef HAVE_LCD_SLEEP
#define SLEEP 0 #define SLEEP 0
#define CMD8 1 #define CMD8 1
#define CMD16 2 #define CMD16 2
#define DATA8 3 #define DATA8 3
#define DATA16 4 #define DATA16 4
unsigned short lcd_init_sequence_0[] = { unsigned short lcd_init_sequence_0[] = {
CMD16, 0x00a4, CMD16, 0x00a4,
@ -329,26 +329,26 @@ void lcd_wakeup(void)
for(unsigned int i=0;i<lcd_init_sequence_length;i+=2) for(unsigned int i=0;i<lcd_init_sequence_length;i+=2)
{ {
switch(lcd_init_sequence[i]) switch(lcd_init_sequence[i])
{ {
case CMD8: case CMD8:
s5l_lcd_write_cmd(lcd_init_sequence[i+1]); s5l_lcd_write_cmd(lcd_init_sequence[i+1]);
break; break;
case DATA8: case DATA8:
s5l_lcd_write_data(lcd_init_sequence[i+1]); s5l_lcd_write_data(lcd_init_sequence[i+1]);
break; break;
case CMD16: case CMD16:
s5l_lcd_write_wcmd(lcd_init_sequence[i+1]); s5l_lcd_write_wcmd(lcd_init_sequence[i+1]);
break; break;
case DATA16: case DATA16:
s5l_lcd_write_wdata(lcd_init_sequence[i+1]); s5l_lcd_write_wdata(lcd_init_sequence[i+1]);
break; break;
case SLEEP: case SLEEP:
sleep(lcd_init_sequence[i+1]); sleep(lcd_init_sequence[i+1]);
break; break;
default: default:
break; break;
} }
} }
lcd_ispowered = true; lcd_ispowered = true;
send_event(LCD_EVENT_ACTIVATION, NULL); send_event(LCD_EVENT_ACTIVATION, NULL);