diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gdisp/Nokia6610/readme.txt | 3 | ||||
| -rw-r--r-- | drivers/gdisp/S6D1121/readme.txt | 3 | ||||
| -rw-r--r-- | drivers/gdisp/SSD1289/gdisp_lld.c | 6 | ||||
| -rw-r--r-- | drivers/gdisp/SSD1289/readme.txt | 3 | ||||
| -rw-r--r-- | drivers/gdisp/SSD1289/ssd1289_lld.c.h | 2 | ||||
| -rw-r--r-- | drivers/gdisp/TestStub/readme.txt | 3 | ||||
| -rw-r--r-- | drivers/touchpad/ADS7843/readme.txt | 3 | ||||
| -rw-r--r-- | drivers/touchpad/XPT2046/readme.txt | 3 |
8 files changed, 9 insertions, 17 deletions
diff --git a/drivers/gdisp/Nokia6610/readme.txt b/drivers/gdisp/Nokia6610/readme.txt index facb400f..926f2d3f 100644 --- a/drivers/gdisp/Nokia6610/readme.txt +++ b/drivers/gdisp/Nokia6610/readme.txt @@ -13,5 +13,4 @@ To use this driver: Olimex SAM7-EX256
2. To your makefile add the following lines:
- include $(CHIBIOS)/os/halext/halext.mk
- include $(CHIBIOS)/os/halext/drivers/gdispXXXXX/gdisp_lld.mk
+ include $(LCDLIB)/drivers/gdisp/Nokia6610/gdisp_lld.mk
diff --git a/drivers/gdisp/S6D1121/readme.txt b/drivers/gdisp/S6D1121/readme.txt index fc24d4a2..9db0786f 100644 --- a/drivers/gdisp/S6D1121/readme.txt +++ b/drivers/gdisp/S6D1121/readme.txt @@ -12,5 +12,4 @@ To use this driver: #define SCREEN_HEIGHT 240
2. To your makefile add the following lines:
- include $(CHIBIOS)/os/halext/halext.mk
- include $(CHIBIOS)/os/halext/drivers/gdispS6d1121/gdisp_lld.mk
+ include $(LCDLIB)/drivers/gdisp/S6D1121/gdisp_lld.mk
diff --git a/drivers/gdisp/SSD1289/gdisp_lld.c b/drivers/gdisp/SSD1289/gdisp_lld.c index 39c7334c..5f017b37 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld.c +++ b/drivers/gdisp/SSD1289/gdisp_lld.c @@ -73,8 +73,6 @@ * @notapi
*/
bool_t GDISP_LLD(init)(void) {
- uint16_t deviceCode;
-
#ifdef LCD_USE_FSMC
/* FSMC setup. TODO: this only works for STM32F1 */
rccEnableAHB(RCC_AHBENR_FSMCEN, 0);
@@ -94,8 +92,6 @@ bool_t GDISP_LLD(init)(void) { FSMC_Bank1->BTCR[FSMC_Bank] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN;
#endif
- deviceCode = lld_lcdReadReg(0x0000);
-
lld_lcdWriteReg(0x0000,0x0001); lld_lcdDelay(5);
lld_lcdWriteReg(0x0003,0xA8A4); lld_lcdDelay(5);
lld_lcdWriteReg(0x000C,0x0000); lld_lcdDelay(5);
@@ -484,7 +480,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { }
#endif
-#if GDISP_HARDWARE_CONTROL || defined(__DOXYGEN__)
+#if (GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL) || defined(__DOXYGEN__)
/**
* @brief Driver Control
* @detail Unsupported control codes are ignored.
diff --git a/drivers/gdisp/SSD1289/readme.txt b/drivers/gdisp/SSD1289/readme.txt index 17d22223..1b64b46d 100644 --- a/drivers/gdisp/SSD1289/readme.txt +++ b/drivers/gdisp/SSD1289/readme.txt @@ -12,5 +12,4 @@ To use this driver: #define SCREEN_HEIGHT 240
2. To your makefile add the following lines:
- include $(CHIBIOS)/os/halext/halext.mk
- include $(CHIBIOS)/os/halext/drivers/gdispSsd1289/gdisp_lld.mk
+ include $(LCDLIB)/drivers/gdisp/SSD1289/gdisp_lld.mk
diff --git a/drivers/gdisp/SSD1289/ssd1289_lld.c.h b/drivers/gdisp/SSD1289/ssd1289_lld.c.h index 7c0fade2..319013cc 100644 --- a/drivers/gdisp/SSD1289/ssd1289_lld.c.h +++ b/drivers/gdisp/SSD1289/ssd1289_lld.c.h @@ -96,6 +96,8 @@ dummy = lld_lcdReadData(); for(i = 0; i < size; i++) buffer[i] = lld_lcdReadData(); + + (void)dummy; } #elif defined(LCD_USE_FSMC) diff --git a/drivers/gdisp/TestStub/readme.txt b/drivers/gdisp/TestStub/readme.txt index 83611acf..73120dfa 100644 --- a/drivers/gdisp/TestStub/readme.txt +++ b/drivers/gdisp/TestStub/readme.txt @@ -13,5 +13,4 @@ To use this driver: you want to compile test eg: GDISP_NEED_MULTITHREAD
2. To your makefile add the following lines:
- include $(CHIBIOS)/os/halext/halext.mk
- include $(CHIBIOS)/os/halext/drivers/gdispTestStub/gdisp_lld.mk
+ include $(LCDLIB)/drivers/gdisp/TestStub/gdisp_lld.mk
diff --git a/drivers/touchpad/ADS7843/readme.txt b/drivers/touchpad/ADS7843/readme.txt index 34a57bc0..6e62bf39 100644 --- a/drivers/touchpad/ADS7843/readme.txt +++ b/drivers/touchpad/ADS7843/readme.txt @@ -4,6 +4,5 @@ To use this driver: a) #define HAL_USE_TOUCHPAD TRUE
2. To your makefile add the following lines:
- include $(LCDLIB)/lcd.mk
- include $(LCDLIB)/halext/drivers/touchpad/touchpadADS7843/touchpad_lld.mk
+ include $(LCDLIB)/drivers/touchpadADS7843/touchpad_lld.mk
diff --git a/drivers/touchpad/XPT2046/readme.txt b/drivers/touchpad/XPT2046/readme.txt index 992d346d..e24ec768 100644 --- a/drivers/touchpad/XPT2046/readme.txt +++ b/drivers/touchpad/XPT2046/readme.txt @@ -4,6 +4,5 @@ To use this driver: a) #define HAL_USE_TOUCHPAD TRUE
2. To your makefile add the following lines:
- include $(LCDLIB)/lcd.mk
- include $(LCDLIB)/halext/drivers/touchpad/touchpadXPT2046/touchpad_lld.mk
+ include $(LCDLIB)/drivers/touchpad/XPT2046/touchpad_lld.mk
|