summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCástor Muñoz <cmvidal@gmail.com>2017-03-03 22:46:57 +0100
committerCástor Muñoz <cmvidal@gmail.com>2017-03-03 22:50:38 +0100
commit1ba5ef716d37a9fe7f0863caed2fab8570b2c7c4 (patch)
tree2e209052bc802183b73a705f77ebc552250c9353
parent8ff1b6b6033aad55fadf076f066da5d8b7d2e631 (diff)
downloadrockbox-1ba5ef716d37a9fe7f0863caed2fab8570b2c7c4.tar.gz
rockbox-1ba5ef716d37a9fe7f0863caed2fab8570b2c7c4.tar.bz2
rockbox-1ba5ef716d37a9fe7f0863caed2fab8570b2c7c4.zip
ipod6g: rename some target files
As preparation to add new targets to the s5l8702 directory, rename files as: s5l8702/ipod6g/*-ipod6g.c -> s5l8702/ipod6g/*-6g.c Change-Id: I0cd03d6bcf39b2aa198235f9014cb6948bbafcd5
-rw-r--r--firmware/SOURCES26
-rw-r--r--firmware/target/arm/s5l8702/ipod6g/adc-6g.c (renamed from firmware/target/arm/s5l8702/ipod6g/adc-ipod6g.c)0
-rw-r--r--firmware/target/arm/s5l8702/ipod6g/audio-6g.c (renamed from firmware/target/arm/s5l8702/ipod6g/audio-ipod6g.c)0
-rw-r--r--firmware/target/arm/s5l8702/ipod6g/backlight-6g.c (renamed from firmware/target/arm/s5l8702/ipod6g/backlight-ipod6g.c)0
-rw-r--r--firmware/target/arm/s5l8702/ipod6g/cscodec-6g.c (renamed from firmware/target/arm/s5l8702/ipod6g/cscodec-ipod6g.c)0
-rw-r--r--firmware/target/arm/s5l8702/ipod6g/lcd-6g.c (renamed from firmware/target/arm/s5l8702/ipod6g/lcd-ipod6g.c)0
-rw-r--r--firmware/target/arm/s5l8702/ipod6g/lcd-asm-6g.S (renamed from firmware/target/arm/s5l8702/ipod6g/lcd-asm-ipod6g.S)62
-rw-r--r--firmware/target/arm/s5l8702/ipod6g/piezo-6g.c (renamed from firmware/target/arm/s5l8702/ipod6g/piezo-ipod6g.c)0
-rw-r--r--firmware/target/arm/s5l8702/ipod6g/pmu-6g.c (renamed from firmware/target/arm/s5l8702/ipod6g/pmu-ipod6g.c)0
-rw-r--r--firmware/target/arm/s5l8702/ipod6g/power-6g.c (renamed from firmware/target/arm/s5l8702/ipod6g/power-ipod6g.c)0
-rw-r--r--firmware/target/arm/s5l8702/ipod6g/powermgmt-6g.c (renamed from firmware/target/arm/s5l8702/ipod6g/powermgmt-ipod6g.c)0
-rw-r--r--firmware/target/arm/s5l8702/ipod6g/rtc-6g.c (renamed from firmware/target/arm/s5l8702/ipod6g/rtc-ipod6g.c)0
-rw-r--r--firmware/target/arm/s5l8702/ipod6g/serial-6g.c (renamed from firmware/target/arm/s5l8702/ipod6g/serial-ipod6g.c)0
-rw-r--r--firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c (renamed from firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c)0
14 files changed, 44 insertions, 44 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 09716be40e..b48f445c9a 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1596,10 +1596,10 @@ target/arm/s5l8700/ipodnano2g/piezo-nano2g.c
#ifdef IPOD_6G
target/arm/ipod/button-clickwheel.c
-target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c
-target/arm/s5l8702/ipod6g/backlight-ipod6g.c
-target/arm/s5l8702/ipod6g/powermgmt-ipod6g.c
-target/arm/s5l8702/ipod6g/power-ipod6g.c
+target/arm/s5l8702/ipod6g/storage_ata-6g.c
+target/arm/s5l8702/ipod6g/backlight-6g.c
+target/arm/s5l8702/ipod6g/powermgmt-6g.c
+target/arm/s5l8702/ipod6g/power-6g.c
target/arm/s5l8702/kernel-s5l8702.c
target/arm/s5l8702/system-s5l8702.c
target/arm/s5l8702/timer-s5l8702.c
@@ -1607,28 +1607,28 @@ target/arm/s5l8702/gpio-s5l8702.c
target/arm/s5l8702/pl080.c
target/arm/s5l8702/dma-s5l8702.c
target/arm/s5l8702/clocking-s5l8702.c
-target/arm/s5l8702/ipod6g/lcd-ipod6g.c
-target/arm/s5l8702/ipod6g/lcd-asm-ipod6g.S
-target/arm/s5l8702/ipod6g/piezo-ipod6g.c
+target/arm/s5l8702/ipod6g/lcd-6g.c
+target/arm/s5l8702/ipod6g/lcd-asm-6g.S
+target/arm/s5l8702/ipod6g/piezo-6g.c
#if 0 //TODO
target/arm/s5l8702/postmortemstub.S
#endif
-target/arm/s5l8702/ipod6g/pmu-ipod6g.c
-target/arm/s5l8702/ipod6g/rtc-ipod6g.c
-target/arm/s5l8702/ipod6g/adc-ipod6g.c
+target/arm/s5l8702/ipod6g/pmu-6g.c
+target/arm/s5l8702/ipod6g/rtc-6g.c
+target/arm/s5l8702/ipod6g/adc-6g.c
#if !defined(BOOTLOADER) || defined(HAVE_BOOTLOADER_USB_MODE)
target/arm/s5l8702/usb-s5l8702.c
#endif
#ifdef HAVE_SERIAL
target/arm/uc870x.c
target/arm/s5l8702/uart-s5l8702.c
-target/arm/s5l8702/ipod6g/serial-ipod6g.c
+target/arm/s5l8702/ipod6g/serial-6g.c
#endif
#ifndef BOOTLOADER
target/arm/s5l8702/debug-s5l8702.c
target/arm/s5l8702/pcm-s5l8702.c
-target/arm/s5l8702/ipod6g/audio-ipod6g.c
-target/arm/s5l8702/ipod6g/cscodec-ipod6g.c
+target/arm/s5l8702/ipod6g/audio-6g.c
+target/arm/s5l8702/ipod6g/cscodec-6g.c
#else
target/arm/s5l8702/spi-s5l8702.c
target/arm/s5l8702/crypto-s5l8702.c
diff --git a/firmware/target/arm/s5l8702/ipod6g/adc-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/adc-6g.c
index fbe5ef805e..fbe5ef805e 100644
--- a/firmware/target/arm/s5l8702/ipod6g/adc-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/adc-6g.c
diff --git a/firmware/target/arm/s5l8702/ipod6g/audio-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/audio-6g.c
index 6a3bab06d6..6a3bab06d6 100644
--- a/firmware/target/arm/s5l8702/ipod6g/audio-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/audio-6g.c
diff --git a/firmware/target/arm/s5l8702/ipod6g/backlight-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/backlight-6g.c
index 7d1c8bde13..7d1c8bde13 100644
--- a/firmware/target/arm/s5l8702/ipod6g/backlight-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/backlight-6g.c
diff --git a/firmware/target/arm/s5l8702/ipod6g/cscodec-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/cscodec-6g.c
index 41531de4e3..41531de4e3 100644
--- a/firmware/target/arm/s5l8702/ipod6g/cscodec-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/cscodec-6g.c
diff --git a/firmware/target/arm/s5l8702/ipod6g/lcd-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/lcd-6g.c
index 14647a5697..14647a5697 100644
--- a/firmware/target/arm/s5l8702/ipod6g/lcd-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/lcd-6g.c
diff --git a/firmware/target/arm/s5l8702/ipod6g/lcd-asm-ipod6g.S b/firmware/target/arm/s5l8702/ipod6g/lcd-asm-6g.S
index 6ee90098af..1ed7c4e189 100644
--- a/firmware/target/arm/s5l8702/ipod6g/lcd-asm-ipod6g.S
+++ b/firmware/target/arm/s5l8702/ipod6g/lcd-asm-6g.S
@@ -56,7 +56,7 @@
#if (YUV2RGB_VERSION == VERSION_SVN)
.section .icode, "ax", %progbits
-
+
/****************************************************************************
* extern void lcd_write_yuv420_lines(unsigned char const * const src[3],
@@ -76,8 +76,8 @@
*
* Converts two lines from YUV to RGB565 and writes to LCD at once. First loop
* loads Cb/Cr, calculates the chroma offset and saves them to buffer. Within
- * the second loop these chroma offset are reloaded from buffer. Within each
- * loop two pixels are calculated and written to LCD.
+ * the second loop these chroma offset are reloaded from buffer. Within each
+ * loop two pixels are calculated and written to LCD.
*/
.align 2
.global lcd_write_yuv420_lines
@@ -86,7 +86,7 @@ lcd_write_yuv420_lines:
/* r0 = src = yuv_src */
/* r1 = dst = out */
/* r2 = width */
- /* r3 = stride */
+ /* r3 = stride */
stmfd sp!, { r4-r10, lr } /* save non-scratch */
ldmia r0, { r9, r10, r12 } /* r9 = yuv_src[0] = Y'_p */
/* r10 = yuv_src[1] = Cb_p */
@@ -113,9 +113,9 @@ lcd_write_yuv420_lines:
sub r1, r1, #128 /* r1 = Cr-128 */
add r2, r1, r1, asl #1 /* r2 = Cr*51 + Cb*24 */
- add r2, r2, r2, asl #4
- add r2, r2, r0, asl #3
- add r2, r2, r0, asl #4
+ add r2, r2, r2, asl #4
+ add r2, r2, r0, asl #3
+ add r2, r2, r0, asl #4
add r4, r1, r1, asl #2 /* r1 = Cr*101 */
add r4, r4, r1, asl #5
@@ -124,9 +124,9 @@ lcd_write_yuv420_lines:
add r1, r1, #256 /* r1 = rv = (r1 + 256) >> 9 */
mov r1, r1, asr #9
rsb r2, r2, #128 /* r2 = guv = (-r2 + 128) >> 8 */
- mov r2, r2, asr #8
+ mov r2, r2, asr #8
add r0, r0, #2 /* r0 = bu = (Cb*128 + 256) >> 9 */
- mov r0, r0, asr #2
+ mov r0, r0, asr #2
stmia r8!, {r0-r2} /* store r0, r1 and r2 to chroma buffer */
/* 1st loop, first pixel */
@@ -141,17 +141,17 @@ lcd_write_yuv420_lines:
orr r5, r6, r4 /* check if clamping is needed... */
orr r5, r5, r3, asr #1 /* ...at all */
- cmp r5, #31
+ cmp r5, #31
bls 15f /* -> no clamp */
cmp r6, #31 /* clamp r */
- mvnhi r6, r6, asr #31
- andhi r6, r6, #31
+ mvnhi r6, r6, asr #31
+ andhi r6, r6, #31
cmp r3, #63 /* clamp g */
mvnhi r3, r3, asr #31
andhi r3, r3, #63
cmp r4, #31 /* clamp b */
- mvnhi r4, r4, asr #31
- andhi r4, r4, #31
+ mvnhi r4, r4, asr #31
+ andhi r4, r4, #31
15: /* no clamp */
/* calculate pixel_1 and save to r4 for later pixel packing */
@@ -166,21 +166,21 @@ lcd_write_yuv420_lines:
add r6, r1, r5, asr #8 /* r6 = r = (Y >> 9) + rv */
add r3, r2, r5, asr #7 /* r3 = g = (Y >> 8) + guv */
- add r5, r0, r5, asr #8 /* r5 = b = (Y >> 9) + bu */
+ add r5, r0, r5, asr #8 /* r5 = b = (Y >> 9) + bu */
orr r0, r6, r5 /* check if clamping is needed... */
orr r0, r0, r3, asr #1 /* ...at all */
- cmp r0, #31
+ cmp r0, #31
bls 15f /* -> no clamp */
cmp r6, #31 /* clamp r */
- mvnhi r6, r6, asr #31
- andhi r6, r6, #31
+ mvnhi r6, r6, asr #31
+ andhi r6, r6, #31
cmp r3, #63 /* clamp g */
mvnhi r3, r3, asr #31
andhi r3, r3, #63
cmp r5, #31 /* clamp b */
- mvnhi r5, r5, asr #31
- andhi r5, r5, #31
+ mvnhi r5, r5, asr #31
+ andhi r5, r5, #31
15: /* no clamp */
/* calculate pixel_2 and pack with pixel_1 before writing */
@@ -196,7 +196,7 @@ lcd_write_yuv420_lines:
/* Reload several registers for pointer rewinding for next loop */
add r8, sp, #12 /* chroma buffer */
ldmia sp, {r7, r9} /* r7 = loop count */
- /* r9 = &ysrc[stride] */
+ /* r9 = &ysrc[stride] */
/* 2nd loop start */
20: /* loop start */
@@ -215,17 +215,17 @@ lcd_write_yuv420_lines:
orr r5, r6, r4 /* check if clamping is needed... */
orr r5, r5, r3, asr #1 /* ...at all */
- cmp r5, #31
+ cmp r5, #31
bls 15f /* -> no clamp */
cmp r6, #31 /* clamp r */
- mvnhi r6, r6, asr #31
- andhi r6, r6, #31
+ mvnhi r6, r6, asr #31
+ andhi r6, r6, #31
cmp r3, #63 /* clamp g */
mvnhi r3, r3, asr #31
andhi r3, r3, #63
cmp r4, #31 /* clamp b */
- mvnhi r4, r4, asr #31
- andhi r4, r4, #31
+ mvnhi r4, r4, asr #31
+ andhi r4, r4, #31
15: /* no clamp */
/* calculate pixel_1 and save to r4 for later pixel packing */
orr r4, r4, r3, lsl #5 /* pixel_1 = r<<11 | g<<5 | b */
@@ -243,17 +243,17 @@ lcd_write_yuv420_lines:
orr r0, r6, r5 /* check if clamping is needed... */
orr r0, r0, r3, asr #1 /* ...at all */
- cmp r0, #31
+ cmp r0, #31
bls 15f /* -> no clamp */
cmp r6, #31 /* clamp r */
- mvnhi r6, r6, asr #31
- andhi r6, r6, #31
+ mvnhi r6, r6, asr #31
+ andhi r6, r6, #31
cmp r3, #63 /* clamp g */
mvnhi r3, r3, asr #31
andhi r3, r3, #63
cmp r5, #31 /* clamp b */
- mvnhi r5, r5, asr #31
- andhi r5, r5, #31
+ mvnhi r5, r5, asr #31
+ andhi r5, r5, #31
15: /* no clamp */
/* calculate pixel_2 and pack with pixel_1 before writing */
diff --git a/firmware/target/arm/s5l8702/ipod6g/piezo-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/piezo-6g.c
index 06735673be..06735673be 100644
--- a/firmware/target/arm/s5l8702/ipod6g/piezo-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/piezo-6g.c
diff --git a/firmware/target/arm/s5l8702/ipod6g/pmu-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/pmu-6g.c
index d282a48d5b..d282a48d5b 100644
--- a/firmware/target/arm/s5l8702/ipod6g/pmu-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/pmu-6g.c
diff --git a/firmware/target/arm/s5l8702/ipod6g/power-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/power-6g.c
index 1a8e1e1a7e..1a8e1e1a7e 100644
--- a/firmware/target/arm/s5l8702/ipod6g/power-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/power-6g.c
diff --git a/firmware/target/arm/s5l8702/ipod6g/powermgmt-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/powermgmt-6g.c
index c5f9c9b9f5..c5f9c9b9f5 100644
--- a/firmware/target/arm/s5l8702/ipod6g/powermgmt-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/powermgmt-6g.c
diff --git a/firmware/target/arm/s5l8702/ipod6g/rtc-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/rtc-6g.c
index 384cded758..384cded758 100644
--- a/firmware/target/arm/s5l8702/ipod6g/rtc-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/rtc-6g.c
diff --git a/firmware/target/arm/s5l8702/ipod6g/serial-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/serial-6g.c
index f1f06987bc..f1f06987bc 100644
--- a/firmware/target/arm/s5l8702/ipod6g/serial-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/serial-6g.c
diff --git a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c
index ef39a5cabb..ef39a5cabb 100644
--- a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c