diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-10-26 01:44:39 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-10-26 01:44:39 +0000 |
commit | 78c956d73b0318e68245bacfda0d3b6561cbac42 (patch) | |
tree | ed7d53c3c901863bc95ae61ccfb25b8cdd72a00e | |
parent | 5365cbe0a5af0ef357e7fc70e793141ccd38f23e (diff) | |
download | rockbox-78c956d73b0318e68245bacfda0d3b6561cbac42.tar.gz rockbox-78c956d73b0318e68245bacfda0d3b6561cbac42.zip |
Make current_vp static and importings from Gigabeat F/X/S lcd drivers as they don't need it anymore.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23354 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/drivers/lcd-16bit.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/lcd-s3c2440.c | 4 |
3 files changed, 0 insertions, 14 deletions
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c index cee6c2aeef..9dd5beb860 100644 --- a/firmware/drivers/lcd-16bit.c +++ b/firmware/drivers/lcd-16bit.c | |||
@@ -66,13 +66,7 @@ static struct viewport default_vp = | |||
66 | .lst_pattern = LCD_DEFAULT_BG, | 66 | .lst_pattern = LCD_DEFAULT_BG, |
67 | }; | 67 | }; |
68 | 68 | ||
69 | /* The Gigabeat target build requires access to the current fg_pattern | ||
70 | in lcd-meg-fx.c */ | ||
71 | #if (!defined(TOSHIBA_GIGABEAT_F)&& !defined(TOSHIBA_GIGABEAT_S)) || defined(SIMULATOR) | ||
72 | static struct viewport* current_vp IDATA_ATTR = &default_vp; | 69 | static struct viewport* current_vp IDATA_ATTR = &default_vp; |
73 | #else | ||
74 | struct viewport* current_vp IDATA_ATTR = &default_vp; | ||
75 | #endif | ||
76 | 70 | ||
77 | /* LCD init */ | 71 | /* LCD init */ |
78 | void lcd_init(void) | 72 | void lcd_init(void) |
diff --git a/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c b/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c index ea3bfaf519..71d8e4bef4 100644 --- a/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c | |||
@@ -34,10 +34,6 @@ | |||
34 | static bool lcd_on = true; | 34 | static bool lcd_on = true; |
35 | static bool lcd_powered = true; | 35 | static bool lcd_powered = true; |
36 | static unsigned lcd_yuv_options = 0; | 36 | static unsigned lcd_yuv_options = 0; |
37 | /* | ||
38 | ** This is imported from lcd-16bit.c | ||
39 | */ | ||
40 | extern struct viewport* current_vp; | ||
41 | 37 | ||
42 | /* Copies a rectangle from one framebuffer to another. Can be used in | 38 | /* Copies a rectangle from one framebuffer to another. Can be used in |
43 | single transfer mode with width = num pixels, and height = 1 which | 39 | single transfer mode with width = num pixels, and height = 1 which |
diff --git a/firmware/target/arm/s3c2440/lcd-s3c2440.c b/firmware/target/arm/s3c2440/lcd-s3c2440.c index 4a4674e87f..8b24aced5b 100644 --- a/firmware/target/arm/s3c2440/lcd-s3c2440.c +++ b/firmware/target/arm/s3c2440/lcd-s3c2440.c | |||
@@ -36,10 +36,6 @@ static bool lcd_on = true; | |||
36 | static bool lcd_powered = true; | 36 | static bool lcd_powered = true; |
37 | #endif | 37 | #endif |
38 | static unsigned lcd_yuv_options = 0; | 38 | static unsigned lcd_yuv_options = 0; |
39 | /* | ||
40 | ** This is imported from lcd-16bit.c | ||
41 | */ | ||
42 | extern struct viewport* current_vp; | ||
43 | 39 | ||
44 | /* Copies a rectangle from one framebuffer to another. Can be used in | 40 | /* Copies a rectangle from one framebuffer to another. Can be used in |
45 | single transfer mode with width = num pixels, and height = 1 which | 41 | single transfer mode with width = num pixels, and height = 1 which |