diff options
author | Steve Markgraf <steve@steve-m.de> | 2012-01-30 18:27:56 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2012-02-03 23:59:36 +0100 |
commit | d37d04dfdcd029f0721e8beddb2686d5316f1e5c (patch) | |
tree | f315b486a3aca93ac82737bbaff9708371c9214b /src/target/firmware | |
parent | 0f95771e62498a20e9b8b0d5a9782543ab0ddd80 (diff) |
firmware: remove deprecated display drivers and fonts
Signed-off-by: Steve Markgraf <steve@steve-m.de>
Diffstat (limited to 'src/target/firmware')
-rw-r--r-- | src/target/firmware/display/display.c | 20 | ||||
-rw-r--r-- | src/target/firmware/display/font_r8x8.c | 261 | ||||
-rw-r--r-- | src/target/firmware/display/ssd1963.c | 210 | ||||
-rw-r--r-- | src/target/firmware/display/st7558.c | 121 | ||||
-rw-r--r-- | src/target/firmware/display/td014.c | 185 | ||||
-rw-r--r-- | src/target/firmware/include/display.h | 49 |
6 files changed, 0 insertions, 846 deletions
diff --git a/src/target/firmware/display/display.c b/src/target/firmware/display/display.c deleted file mode 100644 index 1c8f1fb4..00000000 --- a/src/target/firmware/display/display.c +++ /dev/null @@ -1,20 +0,0 @@ - -#include <stdint.h> - -#include <display.h> - -struct display_driver *display; - -int display_puts(const char *str) -{ - char c; - - if (display->puts) - display->puts(str); - else { - while ((c = *str++)) - display_putchar(c); - } - - return 0; -} diff --git a/src/target/firmware/display/font_r8x8.c b/src/target/firmware/display/font_r8x8.c deleted file mode 100644 index 6f8315d2..00000000 --- a/src/target/firmware/display/font_r8x8.c +++ /dev/null @@ -1,261 +0,0 @@ -/* 8x8 font, vertical scanning */ - -const unsigned char fontdata_r8x8[] ={ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x7e, 0x81, 0x95, 0xb1, 0xb1, 0x95, 0x81, 0x7e, - 0x7e, 0xff, 0xeb, 0xcf, 0xcf, 0xeb, 0xff, 0x7e, - 0x0e, 0x1f, 0x3f, 0x7e, 0x3f, 0x1f, 0x0e, 0x00, - 0x00, 0x08, 0x1c, 0x3e, 0x7f, 0x3e, 0x1c, 0x08, - 0x00, 0x38, 0x38, 0x9f, 0xff, 0x9f, 0x38, 0x38, - 0x10, 0x38, 0xbc, 0xff, 0xbc, 0x38, 0x10, 0x00, - 0x00, 0x00, 0x18, 0x3c, 0x3c, 0x18, 0x00, 0x00, - 0xff, 0xff, 0xe7, 0xc3, 0xc3, 0xe7, 0xff, 0xff, - 0x00, 0x3c, 0x66, 0x42, 0x42, 0x66, 0x3c, 0x00, - 0xff, 0xc3, 0x99, 0xbd, 0xbd, 0x99, 0xc3, 0xff, - 0x70, 0xf8, 0x88, 0x88, 0xfd, 0x7f, 0x07, 0x0f, - 0x00, 0x4e, 0x5f, 0xf1, 0xf1, 0x5f, 0x4e, 0x00, - 0xc0, 0xe0, 0xff, 0x7f, 0x05, 0x05, 0x07, 0x07, - 0xc0, 0xff, 0x7f, 0x05, 0x05, 0x65, 0x7f, 0x3f, - 0x5a, 0x5a, 0x3c, 0xe7, 0xe7, 0x3c, 0x5a, 0x5a, - 0x7f, 0x3e, 0x3e, 0x1c, 0x1c, 0x08, 0x08, 0x00, - 0x08, 0x08, 0x1c, 0x1c, 0x3e, 0x3e, 0x7f, 0x00, - 0x00, 0x24, 0x66, 0xff, 0xff, 0x66, 0x24, 0x00, - 0x00, 0x5f, 0x5f, 0x00, 0x00, 0x5f, 0x5f, 0x00, - 0x06, 0x0f, 0x09, 0x7f, 0x7f, 0x01, 0x7f, 0x7f, - 0x40, 0xda, 0xbf, 0xa5, 0xfd, 0x59, 0x03, 0x02, - 0x00, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x00, - 0x80, 0x94, 0xb6, 0xff, 0xff, 0xb6, 0x94, 0x80, - 0x00, 0x04, 0x06, 0x7f, 0x7f, 0x06, 0x04, 0x00, - 0x00, 0x10, 0x30, 0x7f, 0x7f, 0x30, 0x10, 0x00, - 0x08, 0x08, 0x08, 0x2a, 0x3e, 0x1c, 0x08, 0x00, - 0x08, 0x1c, 0x3e, 0x2a, 0x08, 0x08, 0x08, 0x00, - 0x3c, 0x3c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, - 0x08, 0x1c, 0x3e, 0x08, 0x08, 0x3e, 0x1c, 0x08, - 0x30, 0x38, 0x3c, 0x3e, 0x3e, 0x3c, 0x38, 0x30, - 0x06, 0x0e, 0x1e, 0x3e, 0x3e, 0x1e, 0x0e, 0x06, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x06, 0x5f, 0x5f, 0x06, 0x00, 0x00, 0x00, - 0x00, 0x07, 0x07, 0x00, 0x07, 0x07, 0x00, 0x00, - 0x14, 0x7f, 0x7f, 0x14, 0x7f, 0x7f, 0x14, 0x00, - 0x00, 0x24, 0x2e, 0x6b, 0x6b, 0x3a, 0x12, 0x00, - 0x00, 0x46, 0x66, 0x30, 0x18, 0x0c, 0x66, 0x62, - 0x00, 0x30, 0x7a, 0x4f, 0x5d, 0x37, 0x7a, 0x48, - 0x00, 0x04, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x1c, 0x3e, 0x63, 0x41, 0x00, 0x00, - 0x00, 0x00, 0x41, 0x63, 0x3e, 0x1c, 0x00, 0x00, - 0x08, 0x2a, 0x3e, 0x1c, 0x1c, 0x3e, 0x2a, 0x08, - 0x08, 0x08, 0x3e, 0x3e, 0x08, 0x08, 0x00, 0x00, - 0x00, 0x00, 0x80, 0xe0, 0x60, 0x00, 0x00, 0x00, - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, - 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, - 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x01, - 0x00, 0x3e, 0x7f, 0x71, 0x59, 0x4d, 0x7f, 0x3e, - 0x00, 0x44, 0x42, 0x7f, 0x7f, 0x40, 0x40, 0x00, - 0x00, 0x62, 0x73, 0x59, 0x49, 0x6f, 0x66, 0x00, - 0x00, 0x22, 0x63, 0x49, 0x49, 0x7f, 0x36, 0x00, - 0x00, 0x18, 0x1c, 0x16, 0x53, 0x7f, 0x7f, 0x50, - 0x00, 0x27, 0x67, 0x45, 0x45, 0x7d, 0x39, 0x00, - 0x00, 0x3c, 0x7e, 0x4b, 0x49, 0x79, 0x30, 0x00, - 0x00, 0x03, 0x03, 0x71, 0x79, 0x0f, 0x07, 0x00, - 0x00, 0x36, 0x7f, 0x49, 0x49, 0x7f, 0x36, 0x00, - 0x00, 0x06, 0x4f, 0x49, 0x69, 0x3f, 0x1e, 0x00, - 0x00, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x80, 0xe6, 0x66, 0x00, 0x00, 0x00, - 0x00, 0x08, 0x1c, 0x36, 0x63, 0x41, 0x00, 0x00, - 0x00, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x00, - 0x00, 0x00, 0x41, 0x63, 0x36, 0x1c, 0x08, 0x00, - 0x00, 0x02, 0x03, 0x51, 0x59, 0x0f, 0x06, 0x00, - 0x00, 0x3e, 0x7f, 0x41, 0x5d, 0x55, 0x57, 0x1e, - 0x00, 0x7c, 0x7e, 0x13, 0x13, 0x7e, 0x7c, 0x00, - 0x00, 0x41, 0x7f, 0x7f, 0x49, 0x49, 0x7f, 0x36, - 0x00, 0x1c, 0x3e, 0x63, 0x41, 0x41, 0x63, 0x22, - 0x00, 0x41, 0x7f, 0x7f, 0x41, 0x63, 0x3e, 0x1c, - 0x00, 0x41, 0x7f, 0x7f, 0x49, 0x5d, 0x41, 0x63, - 0x00, 0x41, 0x7f, 0x7f, 0x49, 0x1d, 0x01, 0x03, - 0x00, 0x1c, 0x3e, 0x63, 0x41, 0x51, 0x73, 0x72, - 0x00, 0x7f, 0x7f, 0x08, 0x08, 0x7f, 0x7f, 0x00, - 0x00, 0x00, 0x41, 0x7f, 0x7f, 0x41, 0x00, 0x00, - 0x00, 0x30, 0x70, 0x40, 0x41, 0x7f, 0x3f, 0x01, - 0x00, 0x41, 0x7f, 0x7f, 0x08, 0x1c, 0x77, 0x63, - 0x00, 0x41, 0x7f, 0x7f, 0x41, 0x40, 0x60, 0x70, - 0x00, 0x7f, 0x7f, 0x0e, 0x1c, 0x0e, 0x7f, 0x7f, - 0x00, 0x7f, 0x7f, 0x06, 0x0c, 0x18, 0x7f, 0x7f, - 0x00, 0x3e, 0x7f, 0x41, 0x41, 0x41, 0x7f, 0x3e, - 0x00, 0x41, 0x7f, 0x7f, 0x49, 0x09, 0x0f, 0x06, - 0x00, 0x1e, 0x3f, 0x21, 0x71, 0x7f, 0x5e, 0x00, - 0x00, 0x41, 0x7f, 0x7f, 0x09, 0x19, 0x7f, 0x66, - 0x00, 0x22, 0x67, 0x4d, 0x59, 0x73, 0x22, 0x00, - 0x00, 0x03, 0x41, 0x7f, 0x7f, 0x41, 0x03, 0x00, - 0x00, 0x7f, 0x7f, 0x40, 0x40, 0x7f, 0x7f, 0x00, - 0x00, 0x1f, 0x3f, 0x60, 0x60, 0x3f, 0x1f, 0x00, - 0x00, 0x7f, 0x7f, 0x30, 0x18, 0x30, 0x7f, 0x7f, - 0x00, 0x43, 0x67, 0x3c, 0x18, 0x3c, 0x67, 0x43, - 0x00, 0x07, 0x4f, 0x78, 0x78, 0x4f, 0x07, 0x00, - 0x00, 0x47, 0x63, 0x71, 0x59, 0x4d, 0x67, 0x73, - 0x00, 0x00, 0x7f, 0x7f, 0x41, 0x41, 0x00, 0x00, - 0x00, 0x01, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60, - 0x00, 0x00, 0x41, 0x41, 0x7f, 0x7f, 0x00, 0x00, - 0x00, 0x08, 0x0c, 0x06, 0x03, 0x06, 0x0c, 0x08, - 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, - 0x00, 0x00, 0x00, 0x03, 0x07, 0x04, 0x00, 0x00, - 0x00, 0x20, 0x74, 0x54, 0x54, 0x3c, 0x78, 0x40, - 0x00, 0x41, 0x7f, 0x3f, 0x48, 0x48, 0x78, 0x30, - 0x00, 0x38, 0x7c, 0x44, 0x44, 0x6c, 0x28, 0x00, - 0x00, 0x30, 0x78, 0x48, 0x49, 0x3f, 0x7f, 0x40, - 0x00, 0x38, 0x7c, 0x54, 0x54, 0x5c, 0x18, 0x00, - 0x00, 0x48, 0x7e, 0x7f, 0x49, 0x03, 0x02, 0x00, - 0x00, 0x98, 0xbc, 0xa4, 0xa4, 0xf8, 0x7c, 0x04, - 0x00, 0x41, 0x7f, 0x7f, 0x08, 0x04, 0x7c, 0x78, - 0x00, 0x00, 0x44, 0x7d, 0x7d, 0x40, 0x00, 0x00, - 0x00, 0x60, 0xe0, 0x80, 0x80, 0xfd, 0x7d, 0x00, - 0x00, 0x41, 0x7f, 0x7f, 0x10, 0x38, 0x6c, 0x44, - 0x00, 0x00, 0x41, 0x7f, 0x7f, 0x40, 0x00, 0x00, - 0x00, 0x7c, 0x7c, 0x18, 0x38, 0x1c, 0x7c, 0x78, - 0x00, 0x7c, 0x7c, 0x04, 0x04, 0x7c, 0x78, 0x00, - 0x00, 0x38, 0x7c, 0x44, 0x44, 0x7c, 0x38, 0x00, - 0x00, 0x84, 0xfc, 0xf8, 0xa4, 0x24, 0x3c, 0x18, - 0x00, 0x18, 0x3c, 0x24, 0xa4, 0xf8, 0xfc, 0x84, - 0x00, 0x44, 0x7c, 0x78, 0x4c, 0x04, 0x1c, 0x18, - 0x00, 0x48, 0x5c, 0x54, 0x54, 0x74, 0x24, 0x00, - 0x00, 0x00, 0x04, 0x3e, 0x7f, 0x44, 0x24, 0x00, - 0x00, 0x3c, 0x7c, 0x40, 0x40, 0x3c, 0x7c, 0x40, - 0x00, 0x1c, 0x3c, 0x60, 0x60, 0x3c, 0x1c, 0x00, - 0x00, 0x3c, 0x7c, 0x70, 0x38, 0x70, 0x7c, 0x3c, - 0x00, 0x44, 0x6c, 0x38, 0x10, 0x38, 0x6c, 0x44, - 0x00, 0x9c, 0xbc, 0xa0, 0xa0, 0xfc, 0x7c, 0x00, - 0x00, 0x4c, 0x64, 0x74, 0x5c, 0x4c, 0x64, 0x00, - 0x00, 0x08, 0x08, 0x3e, 0x77, 0x41, 0x41, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00, - 0x00, 0x41, 0x41, 0x77, 0x3e, 0x08, 0x08, 0x00, - 0x00, 0x02, 0x03, 0x01, 0x03, 0x02, 0x03, 0x01, - 0x00, 0x70, 0x78, 0x4c, 0x46, 0x4c, 0x78, 0x70, - 0x00, 0x0e, 0x9f, 0x91, 0xb1, 0xfb, 0x4a, 0x00, - 0x00, 0x3a, 0x7a, 0x40, 0x40, 0x7a, 0x7a, 0x40, - 0x38, 0x7c, 0x54, 0x55, 0x5d, 0x19, 0x00, 0x00, - 0x02, 0x23, 0x75, 0x55, 0x55, 0x7d, 0x7b, 0x42, - 0x00, 0x21, 0x75, 0x54, 0x54, 0x7d, 0x79, 0x40, - 0x00, 0x21, 0x75, 0x55, 0x54, 0x7c, 0x78, 0x40, - 0x00, 0x20, 0x74, 0x57, 0x57, 0x7c, 0x78, 0x40, - 0x00, 0x18, 0x3c, 0xa4, 0xa4, 0xe4, 0x40, 0x00, - 0x02, 0x3b, 0x7d, 0x55, 0x55, 0x5d, 0x1b, 0x02, - 0x39, 0x7d, 0x54, 0x54, 0x5d, 0x19, 0x00, 0x00, - 0x00, 0x39, 0x7d, 0x55, 0x54, 0x5c, 0x18, 0x00, - 0x00, 0x01, 0x45, 0x7c, 0x7c, 0x41, 0x01, 0x00, - 0x00, 0x02, 0x03, 0x45, 0x7d, 0x7d, 0x43, 0x02, - 0x00, 0x01, 0x45, 0x7d, 0x7c, 0x40, 0x00, 0x00, - 0x00, 0x79, 0x7d, 0x16, 0x12, 0x16, 0x7d, 0x79, - 0x00, 0x70, 0x78, 0x2b, 0x2b, 0x78, 0x70, 0x00, - 0x44, 0x7c, 0x7c, 0x55, 0x55, 0x45, 0x00, 0x00, - 0x20, 0x74, 0x54, 0x54, 0x7c, 0x7c, 0x54, 0x54, - 0x00, 0x7c, 0x7e, 0x0b, 0x09, 0x7f, 0x7f, 0x49, - 0x00, 0x32, 0x7b, 0x49, 0x49, 0x7b, 0x32, 0x00, - 0x00, 0x32, 0x7a, 0x48, 0x48, 0x7a, 0x32, 0x00, - 0x00, 0x32, 0x7a, 0x4a, 0x48, 0x78, 0x30, 0x00, - 0x00, 0x3a, 0x7b, 0x41, 0x41, 0x7b, 0x7a, 0x40, - 0x00, 0x3a, 0x7a, 0x42, 0x40, 0x78, 0x78, 0x40, - 0x9a, 0xba, 0xa0, 0xa0, 0xfa, 0x7a, 0x00, 0x00, - 0x01, 0x19, 0x3c, 0x66, 0x66, 0x3c, 0x19, 0x01, - 0x00, 0x3d, 0x7d, 0x40, 0x40, 0x7d, 0x3d, 0x00, - 0x00, 0x18, 0x3c, 0x24, 0xe7, 0xe7, 0x24, 0x24, - 0x00, 0x68, 0x7e, 0x7f, 0x49, 0x43, 0x66, 0x20, - 0x00, 0x2b, 0x2f, 0xfc, 0xfc, 0x2f, 0x2b, 0x00, - 0xff, 0xff, 0x09, 0x09, 0x2f, 0xf6, 0xf8, 0xa0, - 0x40, 0xc0, 0x88, 0xfe, 0x7f, 0x09, 0x03, 0x02, - 0x00, 0x20, 0x74, 0x54, 0x55, 0x7d, 0x79, 0x40, - 0x00, 0x00, 0x44, 0x7d, 0x7d, 0x41, 0x00, 0x00, - 0x00, 0x30, 0x78, 0x48, 0x4a, 0x7a, 0x32, 0x00, - 0x00, 0x38, 0x78, 0x40, 0x42, 0x7a, 0x7a, 0x40, - 0x00, 0x7a, 0x7a, 0x0a, 0x0a, 0x7a, 0x70, 0x00, - 0x00, 0x7d, 0x7d, 0x19, 0x31, 0x7d, 0x7d, 0x00, - 0x00, 0x00, 0x26, 0x2f, 0x29, 0x2f, 0x2f, 0x28, - 0x00, 0x00, 0x26, 0x2f, 0x29, 0x2f, 0x26, 0x00, - 0x00, 0x30, 0x78, 0x4d, 0x45, 0x60, 0x20, 0x00, - 0x00, 0x38, 0x38, 0x08, 0x08, 0x08, 0x08, 0x00, - 0x08, 0x08, 0x08, 0x08, 0x38, 0x38, 0x00, 0x00, - 0x4f, 0x6f, 0x30, 0x18, 0xcc, 0xee, 0xbb, 0x91, - 0x4f, 0x6f, 0x30, 0x18, 0x6c, 0x76, 0xfb, 0xf9, - 0x00, 0x00, 0x00, 0x7b, 0x7b, 0x00, 0x00, 0x00, - 0x08, 0x1c, 0x36, 0x22, 0x08, 0x1c, 0x36, 0x22, - 0x22, 0x36, 0x1c, 0x08, 0x22, 0x36, 0x1c, 0x08, - 0xaa, 0x00, 0x55, 0x00, 0xaa, 0x00, 0x55, 0x00, - 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, - 0xdd, 0xff, 0xaa, 0x77, 0xdd, 0xaa, 0xff, 0x77, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, - 0x10, 0x10, 0x10, 0xff, 0xff, 0x00, 0x00, 0x00, - 0x14, 0x14, 0x14, 0xff, 0xff, 0x00, 0x00, 0x00, - 0x10, 0x10, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, - 0x10, 0x10, 0xf0, 0xf0, 0x10, 0xf0, 0xf0, 0x00, - 0x14, 0x14, 0x14, 0xfc, 0xfc, 0x00, 0x00, 0x00, - 0x14, 0x14, 0xf7, 0xf7, 0x00, 0xff, 0xff, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, - 0x14, 0x14, 0xf4, 0xf4, 0x04, 0xfc, 0xfc, 0x00, - 0x14, 0x14, 0x17, 0x17, 0x10, 0x1f, 0x1f, 0x00, - 0x10, 0x10, 0x1f, 0x1f, 0x10, 0x1f, 0x1f, 0x00, - 0x14, 0x14, 0x14, 0x1f, 0x1f, 0x00, 0x00, 0x00, - 0x10, 0x10, 0x10, 0xf0, 0xf0, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x10, 0x10, 0x10, - 0x10, 0x10, 0x10, 0x1f, 0x1f, 0x10, 0x10, 0x10, - 0x10, 0x10, 0x10, 0xf0, 0xf0, 0x10, 0x10, 0x10, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x10, 0x10, 0x10, - 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, - 0x10, 0x10, 0x10, 0xff, 0xff, 0x10, 0x10, 0x10, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x14, 0x14, 0x14, - 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x10, - 0x00, 0x00, 0x1f, 0x1f, 0x10, 0x17, 0x17, 0x14, - 0x00, 0x00, 0xfc, 0xfc, 0x04, 0xf4, 0xf4, 0x14, - 0x14, 0x14, 0x17, 0x17, 0x10, 0x17, 0x17, 0x14, - 0x14, 0x14, 0xf4, 0xf4, 0x04, 0xf4, 0xf4, 0x14, - 0x00, 0x00, 0xff, 0xff, 0x00, 0xf7, 0xf7, 0x14, - 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, - 0x14, 0x14, 0xf7, 0xf7, 0x00, 0xf7, 0xf7, 0x14, - 0x14, 0x14, 0x14, 0x17, 0x17, 0x14, 0x14, 0x14, - 0x10, 0x10, 0x1f, 0x1f, 0x10, 0x1f, 0x1f, 0x10, - 0x14, 0x14, 0x14, 0xf4, 0xf4, 0x14, 0x14, 0x14, - 0x10, 0x10, 0xf0, 0xf0, 0x10, 0xf0, 0xf0, 0x10, - 0x00, 0x00, 0x1f, 0x1f, 0x10, 0x1f, 0x1f, 0x10, - 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x14, 0x14, 0x14, - 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x14, 0x14, 0x14, - 0x00, 0x00, 0xf0, 0xf0, 0x10, 0xf0, 0xf0, 0x10, - 0x10, 0x10, 0xff, 0xff, 0x10, 0xff, 0xff, 0x10, - 0x14, 0x14, 0x14, 0xff, 0xff, 0x14, 0x14, 0x14, - 0x10, 0x10, 0x10, 0x1f, 0x1f, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xf0, 0xf0, 0x10, 0x10, 0x10, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, - 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, - 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, - 0x00, 0x38, 0x7c, 0x44, 0x6c, 0x38, 0x6c, 0x44, - 0x00, 0xfc, 0xfe, 0x2a, 0x2a, 0x3e, 0x14, 0x00, - 0x00, 0x7e, 0x7e, 0x02, 0x02, 0x06, 0x06, 0x00, - 0x00, 0x02, 0x7e, 0x7e, 0x02, 0x7e, 0x7e, 0x02, - 0x00, 0x63, 0x77, 0x5d, 0x49, 0x63, 0x63, 0x00, - 0x00, 0x38, 0x7c, 0x44, 0x7c, 0x3c, 0x04, 0x04, - 0x00, 0x80, 0xfe, 0x7e, 0x20, 0x20, 0x3e, 0x1e, - 0x00, 0x04, 0x06, 0x02, 0x7e, 0x7c, 0x06, 0x02, - 0x00, 0x99, 0xbd, 0xe7, 0xe7, 0xbd, 0x99, 0x00, - 0x00, 0x1c, 0x3e, 0x6b, 0x49, 0x6b, 0x3e, 0x1c, - 0x00, 0x4c, 0x7e, 0x73, 0x01, 0x73, 0x7e, 0x4c, - 0x00, 0x30, 0x78, 0x4a, 0x4f, 0x7d, 0x39, 0x00, - 0x18, 0x3c, 0x24, 0x3c, 0x3c, 0x24, 0x3c, 0x18, - 0x98, 0xfc, 0x64, 0x3c, 0x3e, 0x27, 0x3d, 0x18, - 0x00, 0x1c, 0x3e, 0x6b, 0x49, 0x49, 0x00, 0x00, - 0x00, 0x7e, 0x7f, 0x01, 0x01, 0x7f, 0x7e, 0x00, - 0x00, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x00, - 0x00, 0x44, 0x44, 0x5f, 0x5f, 0x44, 0x44, 0x00, - 0x00, 0x40, 0x51, 0x5b, 0x4e, 0x44, 0x40, 0x00, - 0x00, 0x40, 0x44, 0x4e, 0x5b, 0x51, 0x40, 0x00, - 0x00, 0x00, 0x00, 0xfe, 0xff, 0x01, 0x07, 0x06, - 0x60, 0xe0, 0x80, 0xff, 0x7f, 0x00, 0x00, 0x00, - 0x00, 0x08, 0x08, 0x6b, 0x6b, 0x08, 0x08, 0x00, - 0x00, 0x24, 0x36, 0x12, 0x36, 0x24, 0x36, 0x12, - 0x00, 0x00, 0x06, 0x0f, 0x09, 0x0f, 0x06, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, - 0x10, 0x30, 0x70, 0xc0, 0xff, 0xff, 0x01, 0x01, - 0x00, 0x1f, 0x1f, 0x01, 0x1f, 0x1e, 0x00, 0x00, - 0x00, 0x19, 0x1d, 0x17, 0x12, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x3c, 0x3c, 0x3c, 0x3c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - diff --git a/src/target/firmware/display/ssd1963.c b/src/target/firmware/display/ssd1963.c deleted file mode 100644 index 49d5275c..00000000 --- a/src/target/firmware/display/ssd1963.c +++ /dev/null @@ -1,210 +0,0 @@ -/* Solomon SSD1963 LCD Driver (probably not exactly the SSD1963) - * as used in the Sony Ericsson J100i */ - -/* (C) 2010-11 by Steve Markgraf <steve@steve-m.de> - * (C) 2010 by Harald Welte <laforge@gnumonks.org> - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ - -#include <stdint.h> -#include <stdio.h> -#include <debug.h> -#include <delay.h> -#include <uwire.h> -#include <display.h> -#include <calypso/clock.h> - -#define LCD_COLUMNS 96 -#define LCD_ROWS 64 -#define LCD_TOP_FREE_ROWS 3 -#define LCD_LEFT_FREE_COLS 0 -#define PIXEL_BYTES 3 -#define SSD1963_UWIRE_BITLEN 9 -#define SSD1963_DEV_ID 0 -#define FONT_HEIGHT 8 -#define FONT_WIDTH 8 - -#define BLACK 0x0000 -#define WHITE 0x0fff - -static void ssd1963_cmd_write(const uint8_t cmd) -{ - uint16_t cmd_out = cmd; - uwire_xfer(SSD1963_DEV_ID, SSD1963_UWIRE_BITLEN, &cmd_out, NULL); -} - -static void ssd1963_data_write(const uint8_t data) -{ - uint16_t data_out = ((0x01 << 8) + data); - uwire_xfer(SSD1963_DEV_ID, SSD1963_UWIRE_BITLEN, &data_out, NULL); -} - -static void ssd1963_clrscr(void) -{ - uint16_t i; - - /* Select the whole display area for clearing */ - ssd1963_cmd_write(0x2b); - ssd1963_data_write(0x00); - ssd1963_data_write(LCD_ROWS-1); - - ssd1963_cmd_write(0x2a); - ssd1963_data_write(0x00); - ssd1963_data_write(LCD_COLUMNS-1); - - ssd1963_cmd_write(0x2c); - - /* Fill the display with white */ - for(i=0; i < (LCD_ROWS * (LCD_COLUMNS/2) * PIXEL_BYTES); i++){ - ssd1963_data_write(0xff); - } -} - -static void ssd1963_init(void) -{ - unsigned int i; - - calypso_reset_set(RESET_EXT, 0); - uwire_init(); - delay_ms(3); - - /* Begin SSD1963 initialization sequence */ - ssd1963_cmd_write(0xb6); /* Set vertical period */ - ssd1963_data_write(0x4b); - ssd1963_data_write(0xf1); - ssd1963_data_write(0x40); - ssd1963_data_write(0x40); - ssd1963_data_write(0x00); - ssd1963_data_write(0x8c); - ssd1963_data_write(0x00); - - ssd1963_cmd_write(0x3a); /* Set pixel format */ - ssd1963_data_write(0x03); /* 0x03: 12 bit, 0x05: 16 Bit / pixel */ - ssd1963_cmd_write(0x11); - - /* Contrast/Electronic Volume Control */ - ssd1963_cmd_write(0xba); - ssd1963_data_write(0x5b); - ssd1963_data_write(0x84); - - ssd1963_cmd_write(0x36); - ssd1963_data_write(0x00); - - ssd1963_cmd_write(0x13); /* Enter normal mode */ - ssd1963_clrscr(); - - ssd1963_cmd_write(0x29); /* Display ON */ -} - -extern const unsigned char fontdata_r8x8_horiz[]; - -/* - * Pixel format for 8-bit mode, 12-bit color, 2 Pixel per 3 byte - * D7, D6, D5, D4, D3, D2, D1, D0: RRRRGGGG (8 bits) 1st write - * D7, D6, D5, D4, D3, D2, D1, D0: BBBBRRRR (8 bits) 2nd write - * D7, D6, D5, D4, D3, D2, D1, D0: GGGGBBBB (8 bits) 3rd write -*/ - -static void ssd1963_goto_xy(int xpos, int ypos) -{ - ssd1963_cmd_write(0x2b); - ssd1963_data_write(xpos); - ssd1963_data_write(xpos + FONT_HEIGHT-1); - - ssd1963_cmd_write(0x2a); - ssd1963_data_write(ypos); - ssd1963_data_write(ypos + FONT_WIDTH-1); -} - -static int ssd1963_putc_col(unsigned char c, int fColor, int bColor) -{ - int i, j; - uint8_t cols = FONT_WIDTH; - uint8_t rows = FONT_HEIGHT; - uint8_t row_slice; - uint8_t rowmask; - uint16_t pixel0; /* left pixel */ - uint16_t pixel1; /* right pixel */ - - ssd1963_cmd_write(0x2c); - - for (i = 0; i < rows; i++) { - row_slice = fontdata_r8x8_horiz[(FONT_WIDTH * c)+i]; - rowmask = 0x80; - for (j = 0; j < cols; j += 2) { - if (!(row_slice & rowmask)) - pixel0 = bColor; - else - pixel0 = fColor; - rowmask = rowmask >> 1; - if (!(row_slice & rowmask)) - pixel1 = bColor; - else - pixel1 = fColor; - rowmask = rowmask >> 1; - /* Write the RGB-RGB pixel data */ - ssd1963_data_write((pixel0 >> 4) & 0xff); - ssd1963_data_write(((pixel0 & 0x00f) << 4) | ((pixel1 >> 8) & 0x00f)); - ssd1963_data_write(pixel1 & 0xff); - } - } - ssd1963_cmd_write(0x00); - - return c; -} - -static int ssd1963_puts_col(const char *str, int txtline, int fColor, int bColor) -{ - int i; - for (i = 0; *str != 0x00; i += FONT_WIDTH) { - ssd1963_goto_xy(((txtline*FONT_HEIGHT)+LCD_TOP_FREE_ROWS), - (i + LCD_LEFT_FREE_COLS)); - ssd1963_putc_col(*str++, fColor, bColor); - } - - return 0; -} - -/* interface to display driver core */ - -static void ssd1963_set_attr(unsigned long attr) -{ - /* FIXME */ -} - -static int ssd1963_putc(unsigned int c) -{ - return ssd1963_putc_col(c, BLACK, WHITE); -} - -static int ssd1963_puts(const char *str) -{ - return ssd1963_puts_col(str, 0, BLACK, WHITE); -} - -const struct display_driver ssd1963_display = { - .name = "ssd1963", - .init = &ssd1963_init, - .set_attr = &ssd1963_set_attr, - .unset_attr = &ssd1963_set_attr, - .clrscr = &ssd1963_clrscr, - .goto_xy = &ssd1963_goto_xy, - .putc = &ssd1963_putc, - .puts = &ssd1963_puts, -}; diff --git a/src/target/firmware/display/st7558.c b/src/target/firmware/display/st7558.c deleted file mode 100644 index b92c2de1..00000000 --- a/src/target/firmware/display/st7558.c +++ /dev/null @@ -1,121 +0,0 @@ -/* Sitronix ST7558 LCD Driver */ - -/* (C) 2010 by Harald Welte <laforge@gnumonks.org> - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ - -#include <stdint.h> -#include <stdio.h> - -#include <debug.h> -#include <delay.h> -#include <memory.h> -#include <i2c.h> -#include <display.h> -#include <calypso/clock.h> - -#define MORE_CONTROL 0x80 -#define CONTROL_RS_RAM 0x40 -#define CONTROL_RS_CMD 0x00 -#define Y_ADDR(n) (0x40|((n)&0xf)) -#define X_ADDR(n) (0x80|((n)&0x3f)) - -static const uint8_t setup[] = { CONTROL_RS_CMD, 0x2e, 0x21, 0x12, 0xc0, 0x0b, - 0x20, 0x11, 0x00, 0x40, 0x80 }; -static const uint8_t home[] = { CONTROL_RS_CMD, Y_ADDR(0), X_ADDR(0) }; - -/* video modes */ -static const uint8_t invert[] = { CONTROL_RS_CMD, 0x20, 0x0d }; -static const uint8_t normal[] = { CONTROL_RS_CMD, 0x20, 0x0c }; -static const uint8_t off[] = { CONTROL_RS_CMD, 0x20, 0x08 }; - -#define ST7558_SLAVE_ADDR 0x3c -static int st7558_write(const uint8_t *data, int len) -{ - int rc = i2c_write(ST7558_SLAVE_ADDR, data[0], 1, data+1, len-1); - return rc; -} - -static const uint8_t zero16[] = { CONTROL_RS_RAM, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0 }; -static void st7558_clrscr(void) -{ - int i; - - st7558_write(home, sizeof(home)); - - for (i = 0; i < 102*9; i += 16) - st7558_write(zero16, sizeof(zero16)); - - st7558_write(home, sizeof(home)); -} - -static void st7558_init(void) -{ - /* Release nRESET */ - calypso_reset_set(RESET_EXT, 0); - - i2c_init(0,0); - - st7558_write(setup, sizeof(setup)); - st7558_clrscr(); -} - -static void st7558_set_attr(unsigned long attr) -{ - if (attr & DISP_ATTR_INVERT) - st7558_write(invert, sizeof(invert)); -} - -static void st7558_unset_attr(unsigned long attr) -{ - if (attr & DISP_ATTR_INVERT) - st7558_write(normal, sizeof(normal)); -} - -/* FIXME: we need a mini-libc */ -static void *mcpy(uint8_t *dst, const uint8_t *src, int len) -{ - while (len--) - *dst++ = *src++; - - return dst; -} - -extern const unsigned char fontdata_r8x8[]; - -static void st7558_putc(unsigned char c) -{ - uint8_t putc_buf[16]; - uint8_t bytes_per_char = 8; - - putc_buf[0] = CONTROL_RS_RAM; - mcpy(putc_buf+1, fontdata_r8x8+(c*bytes_per_char), bytes_per_char); - st7558_write(putc_buf, 1+bytes_per_char); -} - -const struct display_driver st7558_display = { - .name = "st7558", - .init = &st7558_init, - .clrscr = &st7558_clrscr, - .set_attr = &st7558_set_attr, - .unset_attr = &st7558_unset_attr, - .putc = &st7558_putc, -}; diff --git a/src/target/firmware/display/td014.c b/src/target/firmware/display/td014.c deleted file mode 100644 index 11ef3eab..00000000 --- a/src/target/firmware/display/td014.c +++ /dev/null @@ -1,185 +0,0 @@ -/* Toppoly TD014 LCD Driver, as used in the Motorola C139/C140 */ - -/* (C) 2010 by Steve Markgraf <steve@steve-m.de> - * (C) 2010 by Harald Welte <laforge@gnumonks.org> - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ - -#include <stdint.h> -#include <stdio.h> - -#include <debug.h> -#include <delay.h> -#include <uwire.h> -#include <display.h> -#include <calypso/clock.h> - -#define LCD_COLUMNS 96 -#define LCD_ROWS 64 -#define LCD_TOP_FREE_ROWS 3 -#define LCD_LEFT_FREE_COLS 0 -#define PIXEL_BYTES 2 -#define TD014_UWIRE_BITLEN 9 -#define TD014_DEV_ID 0 -#define FONT_HEIGHT 8 -#define FONT_WIDTH 8 - -#define BLACK 0x0000 -#define WHITE 0xffff - -static void td014_cmd_write(const uint8_t cmd) -{ - uint16_t cmd_out = cmd; - uwire_xfer(TD014_DEV_ID, TD014_UWIRE_BITLEN, &cmd_out, NULL); -} - -static void td014_data_write(const uint8_t data) -{ - uint16_t data_out = ((0x01 << 8) + data); - uwire_xfer(TD014_DEV_ID, TD014_UWIRE_BITLEN, &data_out, NULL); -} - -static void td014_clrscr(void) -{ - uint16_t i; - - /* Select the whole display area for clearing */ - td014_cmd_write(0x10); - td014_data_write(0x00); - td014_cmd_write(0x11); - td014_data_write(0x00); - td014_cmd_write(0x12); - td014_data_write(LCD_COLUMNS-1); - td014_cmd_write(0x13); - td014_data_write(LCD_ROWS-1); - td014_cmd_write(0x14); - td014_data_write(0x00); - td014_cmd_write(0x15); - td014_data_write(0x00); - - /* Fill the display with white */ - for(i=0; i < (LCD_ROWS * LCD_COLUMNS * PIXEL_BYTES); i++) { - td014_data_write(0xff); - } -} - -static void td014_init(void) -{ - calypso_reset_set(RESET_EXT, 0); - uwire_init(); - delay_ms(3); - - td014_cmd_write(0x3f); - td014_data_write(0x01); - td014_cmd_write(0x20); - td014_data_write(0x03); - td014_cmd_write(0x31); - td014_data_write(0x03); - - td014_clrscr(); - -} - -extern const unsigned char fontdata_r8x8_horiz[]; - -static void td014_goto_xy(int xpos, int ypos) -{ - td014_cmd_write(0x10); - td014_data_write(ypos); - td014_cmd_write(0x11); - td014_data_write(xpos); - td014_cmd_write(0x12); - td014_data_write(ypos + FONT_HEIGHT-1); - td014_cmd_write(0x13); - td014_data_write(xpos + FONT_WIDTH-1); - td014_cmd_write(0x14); - td014_data_write(ypos); - td014_cmd_write(0x15); - td014_data_write(xpos); - -} - - /* RGB 556 Byte 1 | Byte 2 * - * Pixel format: RRRRRGGG|GGBBBBBB */ - -static int td014_putc_col(unsigned char c, int fColor, int bColor) -{ - int i, j; - uint8_t cols = FONT_WIDTH; - uint8_t rows = FONT_HEIGHT; - uint8_t row_slice; - uint8_t rowmask; - uint16_t pixel; - - for (i = 0; i < rows; i++) { - row_slice = fontdata_r8x8_horiz[(FONT_WIDTH * c)+i]; - rowmask = 0x80; - for (j = 0; j < cols; j++) { - if (!(row_slice & rowmask)) - pixel = bColor; - else - pixel = fColor; - rowmask = rowmask >> 1; - /* Write the pixel data */ - td014_data_write((pixel >> 8) & 0xff); - td014_data_write(pixel & 0xff); - } - } - return c; -} - -static int td014_puts_col(const char *str, int txtline, int fColor, int bColor) -{ - int i; - for (i = 0; *str != 0x00; i += FONT_WIDTH) { - td014_goto_xy(((txtline*FONT_HEIGHT)+LCD_TOP_FREE_ROWS), - (i + LCD_LEFT_FREE_COLS)); - td014_putc_col(*str++, fColor, bColor); - } - - return 0; -} - -/* interface to display driver core */ - -static void td014_set_attr(unsigned long attr) -{ - /* FIXME */ -} - -static int td014_putc(unsigned int c) -{ - return td014_putc_col(c, BLACK, WHITE); -} - -static int td014_puts(const char *str) -{ - return td014_puts_col(str, 0, BLACK, WHITE); -} - -const struct display_driver td014_display = { - .name = "td014", - .init = &td014_init, - .set_attr = &td014_set_attr, - .unset_attr = &td014_set_attr, - .clrscr = &td014_clrscr, - .goto_xy = &td014_goto_xy, - .putc = &td014_putc, - .puts = &td014_puts, -}; diff --git a/src/target/firmware/include/display.h b/src/target/firmware/include/display.h deleted file mode 100644 index 3941b8cb..00000000 --- a/src/target/firmware/include/display.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef _DISPLAY_DRIVER_H -#define _DISPLAY_DRIVER_H - -enum display_attr { - DISP_ATTR_INVERT = 0x0001, -}; - -struct display_driver { - char *name; - void (*init)(void); - void (*set_attr)(unsigned long attr); - void (*unset_attr)(unsigned long attr); - void (*clrscr)(void); - void (*goto_xy)(int xpos, int ypos); - void (*set_color)(int fgcolor, int bgcolor); - int (*putc)(unsigned char c); - int (*puts)(const char *str); -}; - -extern struct display_driver *display; - -static inline void display_init(void) -{ - display->init(); -} -static inline void display_set_attr(unsigned long attr) -{ - display->set_attr(attr); -} -static inline void display_unset_attr(unsigned long attr) -{ - display->unset_attr(attr); -} -static inline void display_clrscr(void) -{ - display->clrscr(); -} -static inline int display_putchar(unsigned char c) -{ - return display->putc(c); -} -int display_puts(const char *s); - -extern const struct display_driver st7558_display; -extern const struct display_driver ssd1783_display; -extern const struct display_driver ssd1963_display; -extern const struct display_driver td014_display; - -#endif |