From 2fb5e1b883bbf2bbed76eb45a4bacd1550a92ada Mon Sep 17 00:00:00 2001 From: kugel Date: Mon, 26 Oct 2009 01:44:39 +0000 Subject: [PATCH] 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 --- firmware/drivers/lcd-16bit.c | 6 ------ firmware/target/arm/imx31/gigabeat-s/lcd-imx31.c | 4 ---- firmware/target/arm/s3c2440/lcd-s3c2440.c | 4 ---- 3 files changed, 14 deletions(-) diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c index cee6c2aee..9dd5beb86 100644 --- a/firmware/drivers/lcd-16bit.c +++ b/firmware/drivers/lcd-16bit.c @@ -66,13 +66,7 @@ static struct viewport default_vp = .lst_pattern = LCD_DEFAULT_BG, }; -/* The Gigabeat target build requires access to the current fg_pattern - in lcd-meg-fx.c */ -#if (!defined(TOSHIBA_GIGABEAT_F)&& !defined(TOSHIBA_GIGABEAT_S)) || defined(SIMULATOR) static struct viewport* current_vp IDATA_ATTR = &default_vp; -#else -struct viewport* current_vp IDATA_ATTR = &default_vp; -#endif /* LCD init */ 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 ea3bfaf51..71d8e4bef 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 @@ static bool lcd_on = true; static bool lcd_powered = true; static unsigned lcd_yuv_options = 0; -/* -** This is imported from lcd-16bit.c -*/ -extern struct viewport* current_vp; /* Copies a rectangle from one framebuffer to another. Can be used in 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 4a4674e87..8b24aced5 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; static bool lcd_powered = true; #endif static unsigned lcd_yuv_options = 0; -/* -** This is imported from lcd-16bit.c -*/ -extern struct viewport* current_vp; /* Copies a rectangle from one framebuffer to another. Can be used in single transfer mode with width = num pixels, and height = 1 which -- 2.11.4.GIT