fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/38147?usp=email )
Change subject: firmware: rename 'se_k2x0' -> 'se_k2xx' (include K205)
......................................................................
firmware: rename 'se_k2x0' -> 'se_k2xx' (include K205)
Sony Ericsson K205 joins the party!
The entire K2xx-series of Sony Ericsson ODM phone models is based on
TI Calypso. The K200, K205, and K220 are identical, except that the
K205 has a different case/housing, and the K220 includes an FM receiver.
Change-Id: I05a4815c38f9cea7c2c7f2a33b836ebd0c016d0d
---
M src/target/firmware/Makefile
R src/target/firmware/board/se_k2xx/init.c
R src/target/firmware/board/se_k2xx/keymap.h
R src/target/firmware/board/se_k2xx/rffe_k2xx.c
R src/target/firmware/fb/fb_k2xx.c
5 files changed, 26 insertions(+), 26 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile
index 2a376bc..9be0bfb 100644
--- a/src/target/firmware/Makefile
+++ b/src/target/firmware/Makefile
@@ -24,7 +24,7 @@
#
# List of all supported boards (meant to be overridden on command line)
-BOARDS?=compal_e88 compal_e86 compal_e99 se_j100 se_k2x0 gta0x gtm900b fcdev3b
\
+BOARDS?=compal_e88 compal_e86 compal_e99 se_j100 se_k2xx gta0x gtm900b fcdev3b
\
pirelli_dpl10 tr800
# Framebuffer support, board specific drivers
@@ -36,7 +36,7 @@
FB_e86_OBJS=$(FB_OBJS) fb/fb_rgb332.o fb/fb_td014.o
FB_j100_OBJS=$(FB_OBJS) fb/fb_rgb332.o fb/fb_ssd1963.o
FB_dpl10_OBJS=$(FB_OBJS) fb/fb_rgb332.o fb/fb_s6b33b1x.o
-FB_k2x0_OBJS=$(FB_OBJS) fb/fb_rgb332.o fb/fb_k2x0.o
+FB_k2xx_OBJS=$(FB_OBJS) fb/fb_rgb332.o fb/fb_k2xx.o
FB_dummy_OBJS=$(FB_OBJS) fb/fb_dummy.o
# TI Calypso
@@ -110,11 +110,11 @@
BOARD_se_j100_ENVIRONMENTS=$(compal_COMMON_ENVIRONMENTS)
# Sony Ericsson K200i/K220i
-BOARD_se_k2x0_OBJS=$(calypso_COMMON_OBJS) board/se_k2x0/init.o \
- board/se_k2x0/rffe_k2x0.o \
+BOARD_se_k2xx_OBJS=$(calypso_COMMON_OBJS) board/se_k2xx/init.o \
+ board/se_k2xx/rffe_k2xx.o \
board/gta0x/rf_tables.o board/gta0x/afcparams.o \
- board/common/readcal_tiffs.o battery/dummy.o $(FB_k2x0_OBJS)
-BOARD_se_k2x0_ENVIRONMENTS=highram
+ board/common/readcal_tiffs.o battery/dummy.o $(FB_k2xx_OBJS)
+BOARD_se_k2xx_ENVIRONMENTS=highram
#
# Applications
diff --git a/src/target/firmware/board/se_k2x0/init.c
b/src/target/firmware/board/se_k2xx/init.c
similarity index 100%
rename from src/target/firmware/board/se_k2x0/init.c
rename to src/target/firmware/board/se_k2xx/init.c
diff --git a/src/target/firmware/board/se_k2x0/keymap.h
b/src/target/firmware/board/se_k2xx/keymap.h
similarity index 100%
rename from src/target/firmware/board/se_k2x0/keymap.h
rename to src/target/firmware/board/se_k2xx/keymap.h
diff --git a/src/target/firmware/board/se_k2x0/rffe_k2x0.c
b/src/target/firmware/board/se_k2xx/rffe_k2xx.c
similarity index 100%
rename from src/target/firmware/board/se_k2x0/rffe_k2x0.c
rename to src/target/firmware/board/se_k2xx/rffe_k2xx.c
diff --git a/src/target/firmware/fb/fb_k2x0.c b/src/target/firmware/fb/fb_k2xx.c
similarity index 87%
rename from src/target/firmware/fb/fb_k2x0.c
rename to src/target/firmware/fb/fb_k2xx.c
index 7e433cd..fe1ad33 100644
--- a/src/target/firmware/fb/fb_k2x0.c
+++ b/src/target/firmware/fb/fb_k2xx.c
@@ -25,8 +25,8 @@
#include <delay.h>
#include <memory.h>
-#define K2X0_WIDTH 128
-#define K2X0_HEIGHT 128
+#define K2XX_WIDTH 128
+#define K2XX_HEIGHT 128
#define ARMIO_LATCH_OUT 0xfffe4802
#define CS3_ADDR 0x02000000
@@ -38,11 +38,11 @@
#define CL761_CLK (1 << 4)
#define CL761_RESET (1 << 9)
-#define K2X0_ENABLE_BACKLIGHT (1 << 3)
+#define K2XX_ENABLE_BACKLIGHT (1 << 3)
-static uint8_t fb_k2x0_mem[K2X0_WIDTH * K2X0_HEIGHT];
+static uint8_t fb_k2xx_mem[K2XX_WIDTH * K2XX_HEIGHT];
-static const uint8_t k2x0_initdata[] = {
+static const uint8_t k2xx_initdata[] = {
0x2c, /* CMD: Standby Mode off */
0x02, /* CMD: Oscillation Mode Set */
0x01, /* DATA: oscillator on */
@@ -95,7 +95,7 @@
writew(data, CL761_DATA_ADDR);
}
-static void fb_k2x0_init(void)
+static void fb_k2xx_init(void)
{
unsigned int i;
uint16_t reg;
@@ -116,14 +116,14 @@
delay_ms(1);
reg &= ~CL761_CLK;
- reg |= (1 << 1) | K2X0_ENABLE_BACKLIGHT;
+ reg |= (1 << 1) | K2XX_ENABLE_BACKLIGHT;
writew(reg, ARMIO_LATCH_OUT);
- for (i = 0; i < sizeof(k2x0_initdata); i++)
- writew(k2x0_initdata[i], DISPLAY_CMD_ADDR);
+ for (i = 0; i < sizeof(k2xx_initdata); i++)
+ writew(k2xx_initdata[i], DISPLAY_CMD_ADDR);
}
-static void fb_k2x0_flush(void)
+static void fb_k2xx_flush(void)
{
unsigned int i;
int x, y;
@@ -170,21 +170,21 @@
fb_rgb332->damage_y1 = fb_rgb332->damage_y2 = 0;
}
-static struct framebuffer fb_k2x0_framebuffer = {
- .name = "k2x0",
- .init = fb_k2x0_init,
+static struct framebuffer fb_k2xx_framebuffer = {
+ .name = "k2xx",
+ .init = fb_k2xx_init,
.clear = fb_rgb332_clear,
.boxto = fb_rgb332_boxto,
.lineto = fb_rgb332_lineto,
.putstr = fb_rgb332_putstr,
- .flush = fb_k2x0_flush,
- .width = K2X0_WIDTH,
- .height = K2X0_HEIGHT
+ .flush = fb_k2xx_flush,
+ .width = K2XX_WIDTH,
+ .height = K2XX_HEIGHT
};
-static struct fb_rgb332 fb_k2x0_rgb332 = {
- .mem = fb_k2x0_mem
+static struct fb_rgb332 fb_k2xx_rgb332 = {
+ .mem = fb_k2xx_mem
};
-struct framebuffer *framebuffer = &fb_k2x0_framebuffer;
-struct fb_rgb332 *fb_rgb332 = &fb_k2x0_rgb332;
+struct framebuffer *framebuffer = &fb_k2xx_framebuffer;
+struct fb_rgb332 *fb_rgb332 = &fb_k2xx_rgb332;
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38147?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I05a4815c38f9cea7c2c7f2a33b836ebd0c016d0d
Gerrit-Change-Number: 38147
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
