diff --git a/firmware/drivers/lcd-h100-remote.c b/firmware/drivers/lcd-h100-remote.c index 04a4b7f7a0..4798a51743 100644 --- a/firmware/drivers/lcd-h100-remote.c +++ b/firmware/drivers/lcd-h100-remote.c @@ -19,6 +19,7 @@ #include "config.h" #include "cpu.h" +#include "lcd.h" #include "lcd-remote.h" #include "kernel.h" #include "thread.h" @@ -29,64 +30,25 @@ #include "system.h" #include "font.h" -/* All zeros and ones bitmaps for area filling */ -static const unsigned char zeros[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; -static const unsigned char ones[8] = { - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff -}; +/*** definitions ***/ -static int curfont = FONT_SYSFIXED; -static int xmargin = 0; -static int ymargin = 0; -#ifndef SIMULATOR -static int xoffset; /* needed for flip */ -#endif - -unsigned char lcd_remote_framebuffer[LCD_REMOTE_HEIGHT/8][LCD_REMOTE_WIDTH] -#ifndef SIMULATOR - __attribute__ ((section(".idata"))) -#endif - ; - -#define SCROLL_SPACING 3 -#define SCROLLABLE_LINES 26 - -struct scrollinfo { - char line[MAX_PATH + LCD_REMOTE_WIDTH/2 + SCROLL_SPACING + 2]; - int len; /* length of line in chars */ - int width; /* length of line in pixels */ - int offset; - int startx; - bool backward; /* scroll presently forward or backward? */ - bool bidir; - bool invert; /* invert the scrolled text */ - long start_tick; -}; - -static volatile int scrolling_lines=0; /* Bitpattern of which lines are scrolling */ - -#ifndef SIMULATOR -static int countdown; /* for remote plugging debounce */ -static bool last_remote_status = false; -static bool init_remote = false; /* scroll thread should init lcd */ -static bool remote_initialized = false; - -/* cached settings values, for hotplug init */ -static bool cached_invert = false; -static bool cached_flip = false; -static int cached_contrast = 32; -static int cached_roll = 0; - -static void scroll_thread(void); -static long scroll_stack[DEFAULT_STACK_SIZE/sizeof(long)]; -#endif -static const char scroll_name[] = "remote_scroll"; -static char scroll_ticks = 12; /* # of ticks between updates*/ -static int scroll_delay = HZ/2; /* ticks delay before start */ -static char scroll_step = 6; /* pixels per scroll step */ -static int bidir_limit = 50; /* percent */ -static struct scrollinfo scroll[SCROLLABLE_LINES]; +#define LCD_REMOTE_CNTL_ADC_NORMAL 0xa0 +#define LCD_REMOTE_CNTL_ADC_REVERSE 0xa1 +#define LCD_REMOTE_CNTL_SHL_NORMAL 0xc0 +#define LCD_REMOTE_CNTL_SHL_REVERSE 0xc8 +#define LCD_REMOTE_CNTL_DISPLAY_ON_OFF 0xae +#define LCD_REMOTE_CNTL_ENTIRE_ON_OFF 0xa4 +#define LCD_REMOTE_CNTL_REVERSE_ON_OFF 0xa6 +#define LCD_REMOTE_CNTL_NOP 0xe3 +#define LCD_REMOTE_CNTL_POWER_CONTROL 0x2b +#define LCD_REMOTE_CNTL_SELECT_REGULATOR 0x20 +#define LCD_REMOTE_CNTL_SELECT_BIAS 0xa2 +#define LCD_REMOTE_CNTL_SELECT_VOLTAGE 0x81 +#define LCD_REMOTE_CNTL_INIT_LINE 0x40 +#define LCD_REMOTE_CNTL_SET_PAGE_ADDRESS 0xB0 +#define LCD_REMOTE_CNTL_HIGHCOL 0x10 /* Upper column address */ +#define LCD_REMOTE_CNTL_LOWCOL 0x00 /* Lower column address */ #define CS_LO GPIO1_OUT &= ~0x00000004 #define CS_HI GPIO1_OUT |= 0x00000004 @@ -100,6 +62,59 @@ static struct scrollinfo scroll[SCROLLABLE_LINES]; /* delay loop */ #define DELAY do { int _x; for(_x=0;_x<3;_x++);} while (0) +#define SCROLLABLE_LINES 13 + +/*** globals ***/ + +unsigned char lcd_remote_framebuffer[LCD_REMOTE_HEIGHT/8][LCD_REMOTE_WIDTH] +#ifndef SIMULATOR + __attribute__ ((section(".idata"))) +#endif + ; + +static int curfont = FONT_SYSFIXED; +static int xmargin = 0; +static int ymargin = 0; +#ifndef SIMULATOR +static int xoffset; /* needed for flip */ + +/* remote hotplug */ +static int countdown; /* for remote plugging debounce */ +static bool last_remote_status = false; +static bool init_remote = false; /* scroll thread should init lcd */ +static bool remote_initialized = false; +/* cached settings values */ +static bool cached_invert = false; +static bool cached_flip = false; +static int cached_contrast = 32; +static int cached_roll = 0; +#endif + +/* All zeros and ones bitmaps for area filling */ +static const unsigned char zeros[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; +static const unsigned char ones[8] = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +}; + +/* scrolling */ +static volatile int scrolling_lines=0; /* Bitpattern of which lines are scrolling */ +static void scroll_thread(void); +static long scroll_stack[DEFAULT_STACK_SIZE/sizeof(long)]; +static const char scroll_name[] = "remote_scroll"; +static char scroll_ticks = 12; /* # of ticks between updates*/ +static int scroll_delay = HZ/2; /* ticks delay before start */ +static char scroll_step = 6; /* pixels per scroll step */ +static int bidir_limit = 50; /* percent */ +static struct scrollinfo scroll[SCROLLABLE_LINES]; + +static const char scroll_tick_table[16] = { + /* Hz values: + 1, 1.25, 1.55, 2, 2.5, 3.12, 4, 5, 6.25, 8.33, 10, 12.5, 16.7, 20, 25, 33 */ + 100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3 +}; + +/*** driver routines ***/ + #ifndef SIMULATOR void lcd_remote_backlight_on(void) { @@ -115,8 +130,8 @@ void lcd_remote_write_command(int cmd) { int i; - CS_LO; RS_LO; + CS_LO; for (i = 0; i < 8; i++) { @@ -140,8 +155,8 @@ void lcd_remote_write_data(const unsigned char* p_bytes, int count) int i, j; int data; - CS_LO; RS_HI; + CS_LO; for (i = 0; i < count; i++) { @@ -202,24 +217,16 @@ void lcd_remote_write_command_ex(int cmd, int data) CS_HI; } +#endif /* !SIMULATOR */ -#define LCD_REMOTE_CNTL_ADC_NORMAL 0xa0 -#define LCD_REMOTE_CNTL_ADC_REVERSE 0xa1 -#define LCD_REMOTE_CNTL_SHL_NORMAL 0xc0 -#define LCD_REMOTE_CNTL_SHL_REVERSE 0xc8 -#define LCD_REMOTE_CNTL_DISPLAY_ON_OFF 0xae -#define LCD_REMOTE_CNTL_ENTIRE_ON_OFF 0xa4 -#define LCD_REMOTE_CNTL_REVERSE_ON_OFF 0xa6 -#define LCD_REMOTE_CNTL_NOP 0xe3 -#define LCD_REMOTE_CNTL_POWER_CONTROL 0x2b -#define LCD_REMOTE_CNTL_SELECT_REGULATOR 0x20 -#define LCD_REMOTE_CNTL_SELECT_BIAS 0xa2 -#define LCD_REMOTE_CNTL_SELECT_VOLTAGE 0x81 -#define LCD_REMOTE_CNTL_INIT_LINE 0x40 -#define LCD_REMOTE_CNTL_SET_PAGE_ADDRESS 0xB0 +/*** hardware configuration ***/ -#define LCD_REMOTE_CNTL_HIGHCOL 0x10 /* Upper column address */ -#define LCD_REMOTE_CNTL_LOWCOL 0x00 /* Lower column address */ +int lcd_remote_default_contrast(void) +{ + return 32; +} + +#ifndef SIMULATOR void lcd_remote_powersave(bool on) { @@ -268,15 +275,441 @@ void lcd_remote_set_flip(bool yesno) } } -int lcd_remote_default_contrast(void) +/* Rolls up the lcd display by the specified amount of lines. + * Lines that are rolled out over the top of the screen are + * rolled in from the bottom again. This is a hardware + * remapping only and all operations on the lcd are affected. + * -> + * @param int lines - The number of lines that are rolled. + * The value must be 0 <= pixels < LCD_REMOTE_HEIGHT. */ +void lcd_remote_roll(int lines) { - return 32; + char data[2]; + + cached_roll = lines; + + if (remote_initialized) + { + lines &= LCD_REMOTE_HEIGHT-1; + data[0] = lines & 0xff; + data[1] = lines >> 8; + + lcd_remote_write_command(LCD_REMOTE_CNTL_INIT_LINE | 0x0); // init line + lcd_remote_write_data(data, 2); + } } -#endif +/* The actual LCD init */ +static void remote_lcd_init(void) +{ + lcd_remote_write_command(LCD_REMOTE_CNTL_SELECT_BIAS | 0x0); -void lcd_remote_bitmap(const unsigned char *src, int x, int y, int nx, int ny, bool clear) __attribute__ ((section (".icode"))); -void lcd_remote_bitmap(const unsigned char *src, int x, int y, int nx, int ny, bool clear) + lcd_remote_write_command(LCD_REMOTE_CNTL_POWER_CONTROL | 0x5); + sleep(1); + lcd_remote_write_command(LCD_REMOTE_CNTL_POWER_CONTROL | 0x6); + sleep(1); + lcd_remote_write_command(LCD_REMOTE_CNTL_POWER_CONTROL | 0x7); + + lcd_remote_write_command(LCD_REMOTE_CNTL_SELECT_REGULATOR | 0x4); // 0x4 Select regulator @ 5.0 (default); + + sleep(1); + + lcd_remote_write_command(LCD_REMOTE_CNTL_INIT_LINE | 0x0); // init line + lcd_remote_write_command(LCD_REMOTE_CNTL_SET_PAGE_ADDRESS | 0x0); // page address + lcd_remote_write_command_ex(0x10, 0x00); // Column MSB + LSB + + lcd_remote_write_command(LCD_REMOTE_CNTL_DISPLAY_ON_OFF | 1); + + remote_initialized = true; + + lcd_remote_set_flip(cached_flip); + lcd_remote_set_contrast(cached_contrast); + lcd_remote_set_invert_display(cached_invert); + lcd_remote_roll(cached_roll); +} + +/* Monitor remote hotswap */ +static void remote_tick(void) +{ + bool current_status; + + current_status = ((GPIO_READ & 0x40000000) == 0); + /* Only report when the status has changed */ + if (current_status != last_remote_status) + { + last_remote_status = current_status; + countdown = current_status ? HZ : 1; + } + else + { + /* Count down until it gets negative */ + if (countdown >= 0) + countdown--; + + if (countdown == 0) + { + if (current_status) + { + init_remote = true; + /* request init in scroll_thread */ + } + else + { + CLK_LO; + CS_HI; + remote_initialized = false; + } + } + } +} + +/* Initialise ports and kick off monitor */ +void lcd_remote_init(void) +{ + GPIO_FUNCTION |= 0x10010800; /* GPIO11: Backlight + GPIO16: RS + GPIO28: CLK */ + + GPIO1_FUNCTION |= 0x00040004; /* GPIO34: CS + GPIO50: Data */ + GPIO_ENABLE |= 0x10010800; + GPIO1_ENABLE |= 0x00040004; + + lcd_remote_clear_display(); + + tick_add_task(remote_tick); + create_thread(scroll_thread, scroll_stack, + sizeof(scroll_stack), scroll_name); +} + +/*** update functions ***/ + +/* Update the display. + This must be called after all other LCD functions that change the display. */ +void lcd_remote_update(void) __attribute__ ((section (".icode"))); +void lcd_remote_update(void) +{ + int y; + + if (!remote_initialized) + return; + + /* Copy display bitmap to hardware */ + for (y = 0; y < LCD_REMOTE_HEIGHT / 8; y++) + { + lcd_remote_write_command(LCD_REMOTE_CNTL_SET_PAGE_ADDRESS | y); + lcd_remote_write_command(LCD_REMOTE_CNTL_HIGHCOL | ((xoffset>>4) & 0xf)); + lcd_remote_write_command(LCD_REMOTE_CNTL_LOWCOL | (xoffset & 0xf)); + lcd_remote_write_data(lcd_remote_framebuffer[y], LCD_REMOTE_WIDTH); + } +} + +/* Update a fraction of the display. */ +void lcd_remote_update_rect(int, int, int, int) __attribute__ ((section (".icode"))); +void lcd_remote_update_rect(int x_start, int y, int width, int height) +{ + int ymax; + + if (!remote_initialized) + return; + + /* The Y coordinates have to work on even 8 pixel rows */ + ymax = (y + height-1)/8; + y /= 8; + + if(x_start + width > LCD_REMOTE_WIDTH) + width = LCD_REMOTE_WIDTH - x_start; + if (width <= 0) + return; /* nothing left to do, 0 is harmful to lcd_write_data() */ + if(ymax >= LCD_REMOTE_HEIGHT/8) + ymax = LCD_REMOTE_HEIGHT/8-1; + + /* Copy specified rectange bitmap to hardware */ + for (; y <= ymax; y++) + { + lcd_remote_write_command(LCD_REMOTE_CNTL_SET_PAGE_ADDRESS | y); + lcd_remote_write_command(LCD_REMOTE_CNTL_HIGHCOL + | (((x_start+xoffset)>>4) & 0xf)); + lcd_remote_write_command(LCD_REMOTE_CNTL_LOWCOL + | ((x_start+xoffset) & 0xf)); + lcd_remote_write_data(&lcd_remote_framebuffer[y][x_start], width); + } +} +#endif /* !SIMULATOR */ + +/*** parameter handling ***/ + +void lcd_remote_setmargins(int x, int y) +{ + xmargin = x; + ymargin = y; +} + +int lcd_remote_getxmargin(void) +{ + return xmargin; +} + +int lcd_remote_getymargin(void) +{ + return ymargin; +} + + +void lcd_remote_setfont(int newfont) +{ + curfont = newfont; +} + +int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h) +{ + return font_getstringsize(str, w, h, curfont); +} + +/*** drawing functions ***/ + +void lcd_remote_clear_display(void) +{ + memset(lcd_remote_framebuffer, 0, sizeof lcd_remote_framebuffer); +} + +/* Set a single pixel */ +void lcd_remote_drawpixel(int x, int y) +{ + REMOTE_DRAW_PIXEL(x,y); +} + +/* Clear a single pixel */ +void lcd_remote_clearpixel(int x, int y) +{ + REMOTE_CLEAR_PIXEL(x,y); +} + +/* Invert a single pixel */ +void lcd_remote_invertpixel(int x, int y) +{ + REMOTE_INVERT_PIXEL(x,y); +} + +void lcd_remote_drawline(int x1, int y1, int x2, int y2) +{ + int numpixels; + int i; + int deltax, deltay; + int d, dinc1, dinc2; + int x, xinc1, xinc2; + int y, yinc1, yinc2; + + deltax = abs(x2 - x1); + deltay = abs(y2 - y1); + + if(deltax >= deltay) + { + numpixels = deltax; + d = 2 * deltay - deltax; + dinc1 = deltay * 2; + dinc2 = (deltay - deltax) * 2; + xinc1 = 1; + xinc2 = 1; + yinc1 = 0; + yinc2 = 1; + } + else + { + numpixels = deltay; + d = 2 * deltax - deltay; + dinc1 = deltax * 2; + dinc2 = (deltax - deltay) * 2; + xinc1 = 0; + xinc2 = 1; + yinc1 = 1; + yinc2 = 1; + } + numpixels++; /* include endpoints */ + + if(x1 > x2) + { + xinc1 = -xinc1; + xinc2 = -xinc2; + } + + if(y1 > y2) + { + yinc1 = -yinc1; + yinc2 = -yinc2; + } + + x = x1; + y = y1; + + for(i=0; i= deltay) + { + numpixels = deltax; + d = 2 * deltay - deltax; + dinc1 = deltay * 2; + dinc2 = (deltay - deltax) * 2; + xinc1 = 1; + xinc2 = 1; + yinc1 = 0; + yinc2 = 1; + } + else + { + numpixels = deltay; + d = 2 * deltax - deltay; + dinc1 = deltax * 2; + dinc2 = (deltax - deltay) * 2; + xinc1 = 0; + xinc2 = 1; + yinc1 = 1; + yinc2 = 1; + } + numpixels++; /* include endpoints */ + + if(x1 > x2) + { + xinc1 = -xinc1; + xinc2 = -xinc2; + } + + if(y1 > y2) + { + yinc1 = -yinc1; + yinc2 = -yinc2; + } + + x = x1; + y = y1; + + for(i=0; i LCD_REMOTE_WIDTH) + { + return; + } + + if (y > LCD_REMOTE_HEIGHT) + { + return; + } + + if (x + nx > LCD_REMOTE_WIDTH) + { + nx = LCD_REMOTE_WIDTH - x; + } + + if (y + ny > LCD_REMOTE_HEIGHT) + { + ny = LCD_REMOTE_HEIGHT - y; + } + + /* vertical lines */ + for (i = 0; i < ny; i++) + { + REMOTE_DRAW_PIXEL(x, (y + i)); + REMOTE_DRAW_PIXEL((x + nx - 1), (y + i)); + } + + /* horizontal lines */ + for (i = 0; i < nx; i++) + { + REMOTE_DRAW_PIXEL((x + i),y); + REMOTE_DRAW_PIXEL((x + i),(y + ny - 1)); + } +} + +/* Clear a rectangular area at (x, y), size (nx, ny) */ +void lcd_remote_clearrect(int x, int y, int nx, int ny) +{ + int i; + for (i = 0; i < nx; i++) + lcd_remote_bitmap(zeros, x+i, y, 1, ny, true); +} + +/* Fill a rectangular area at (x, y), size (nx, ny) */ +void lcd_remote_fillrect(int x, int y, int nx, int ny) +{ + int i; + for (i = 0; i < nx; i++) + lcd_remote_bitmap(ones, x+i, y, 1, ny, true); +} + +/* Invert a rectangular area at (x, y), size (nx, ny) */ +void lcd_remote_invertrect(int x, int y, int nx, int ny) +{ + int i, j; + + if (x > LCD_REMOTE_WIDTH) + return; + if (y > LCD_REMOTE_HEIGHT) + return; + + if (x + nx > LCD_REMOTE_WIDTH) + nx = LCD_REMOTE_WIDTH - x; + if (y + ny > LCD_REMOTE_HEIGHT) + ny = LCD_REMOTE_HEIGHT - y; + + for (i = 0; i < nx; i++) + for (j = 0; j < ny; j++) + REMOTE_INVERT_PIXEL((x + i), (y + j)); +} + +void lcd_remote_bitmap(const unsigned char *src, int x, int y, int nx, int ny, + bool clear) __attribute__ ((section (".icode"))); +void lcd_remote_bitmap(const unsigned char *src, int x, int y, int nx, int ny, + bool clear) { const unsigned char *src_col; unsigned char *dst, *dst_col; @@ -377,272 +810,6 @@ void lcd_remote_bitmap(const unsigned char *src, int x, int y, int nx, int ny, b } } -void lcd_remote_drawrect(int x, int y, int nx, int ny) -{ - int i; - - if (x > LCD_REMOTE_WIDTH) - { - return; - } - - if (y > LCD_REMOTE_HEIGHT) - { - return; - } - - if (x + nx > LCD_REMOTE_WIDTH) - { - nx = LCD_REMOTE_WIDTH - x; - } - - if (y + ny > LCD_REMOTE_HEIGHT) - { - ny = LCD_REMOTE_HEIGHT - y; - } - - /* vertical lines */ - for (i = 0; i < ny; i++) - { - REMOTE_DRAW_PIXEL(x, (y + i)); - REMOTE_DRAW_PIXEL((x + nx - 1), (y + i)); - } - - /* horizontal lines */ - for (i = 0; i < nx; i++) - { - REMOTE_DRAW_PIXEL((x + i),y); - REMOTE_DRAW_PIXEL((x + i),(y + ny - 1)); - } -} - -void lcd_remote_clear_display(void) -{ - memset(lcd_remote_framebuffer, 0, sizeof lcd_remote_framebuffer); -} - -#ifndef SIMULATOR - -static void remote_lcd_init(void) -{ - lcd_remote_write_command(LCD_REMOTE_CNTL_SELECT_BIAS | 0x0); - - lcd_remote_write_command(LCD_REMOTE_CNTL_POWER_CONTROL | 0x5); - sleep(1); - lcd_remote_write_command(LCD_REMOTE_CNTL_POWER_CONTROL | 0x6); - sleep(1); - lcd_remote_write_command(LCD_REMOTE_CNTL_POWER_CONTROL | 0x7); - - lcd_remote_write_command(LCD_REMOTE_CNTL_SELECT_REGULATOR | 0x4); // 0x4 Select regulator @ 5.0 (default); - - sleep(1); - - lcd_remote_write_command(LCD_REMOTE_CNTL_INIT_LINE | 0x0); // init line - lcd_remote_write_command(LCD_REMOTE_CNTL_SET_PAGE_ADDRESS | 0x0); // page address - lcd_remote_write_command_ex(0x10, 0x00); // Column MSB + LSB - - lcd_remote_write_command(LCD_REMOTE_CNTL_DISPLAY_ON_OFF | 1); - - remote_initialized = true; - - lcd_remote_set_flip(cached_flip); - lcd_remote_set_contrast(cached_contrast); - lcd_remote_set_invert_display(cached_invert); - lcd_remote_roll(cached_roll); -} - -static void remote_tick(void) -{ - bool current_status; - - current_status = ((GPIO_READ & 0x40000000) == 0); - /* Only report when the status has changed */ - if (current_status != last_remote_status) - { - last_remote_status = current_status; - countdown = current_status ? HZ : 1; - } - else - { - /* Count down until it gets negative */ - if (countdown >= 0) - countdown--; - - if (countdown == 0) - { - if (current_status) - { - init_remote = true; - /* request init in scroll_thread */ - } - else - { - CLK_LO; - CS_HI; - remote_initialized = false; - } - } - } -} - -void lcd_remote_init(void) -{ - GPIO_FUNCTION |= 0x10010800; /* GPIO11: Backlight - GPIO16: RS - GPIO28: CLK */ - - GPIO1_FUNCTION |= 0x00040004; /* GPIO34: CS - GPIO50: Data */ - GPIO_ENABLE |= 0x10010800; - GPIO1_ENABLE |= 0x00040004; - - lcd_remote_clear_display(); - - tick_add_task(remote_tick); - create_thread(scroll_thread, scroll_stack, - sizeof(scroll_stack), scroll_name); -} - - -/* - * Update the display. - * This must be called after all other LCD functions that change the display. - */ -void lcd_remote_update (void) __attribute__ ((section (".icode"))); -void lcd_remote_update (void) -{ - int y; - - if (!remote_initialized) - return; - - /* Copy display bitmap to hardware */ - for (y = 0; y < LCD_REMOTE_HEIGHT / 8; y++) - { - lcd_remote_write_command(LCD_REMOTE_CNTL_SET_PAGE_ADDRESS | y); - lcd_remote_write_command(LCD_REMOTE_CNTL_HIGHCOL | ((xoffset>>4) & 0xf)); - lcd_remote_write_command(LCD_REMOTE_CNTL_LOWCOL | (xoffset & 0xf)); - lcd_remote_write_data(lcd_remote_framebuffer[y], LCD_REMOTE_WIDTH); - } -} - -/* - * Update a fraction of the display. - */ -void lcd_remote_update_rect (int, int, int, int) __attribute__ ((section (".icode"))); -void lcd_remote_update_rect (int x_start, int y, - int width, int height) -{ - int ymax; - - if (!remote_initialized) - return; - - /* The Y coordinates have to work on even 8 pixel rows */ - ymax = (y + height-1)/8; - y /= 8; - - if(x_start + width > LCD_REMOTE_WIDTH) - width = LCD_REMOTE_WIDTH - x_start; - if (width <= 0) - return; /* nothing left to do, 0 is harmful to lcd_write_data() */ - if(ymax >= LCD_REMOTE_HEIGHT/8) - ymax = LCD_REMOTE_HEIGHT/8-1; - - /* Copy specified rectange bitmap to hardware */ - for (; y <= ymax; y++) - { - lcd_remote_write_command(LCD_REMOTE_CNTL_SET_PAGE_ADDRESS | y); - lcd_remote_write_command(LCD_REMOTE_CNTL_HIGHCOL - | (((x_start+xoffset)>>4) & 0xf)); - lcd_remote_write_command(LCD_REMOTE_CNTL_LOWCOL - | ((x_start+xoffset) & 0xf)); - lcd_remote_write_data(&lcd_remote_framebuffer[y][x_start], width); - } -} - -/** - * Rolls up the lcd display by the specified amount of lines. - * Lines that are rolled out over the top of the screen are - * rolled in from the bottom again. This is a hardware - * remapping only and all operations on the lcd are affected. - * -> - * @param int lines - The number of lines that are rolled. - * The value must be 0 <= pixels < LCD_REMOTE_HEIGHT. - */ -void lcd_remote_roll(int lines) -{ - char data[2]; - - cached_roll = lines; - - if (remote_initialized) - { - lines &= LCD_REMOTE_HEIGHT-1; - data[0] = lines & 0xff; - data[1] = lines >> 8; - - lcd_remote_write_command(LCD_REMOTE_CNTL_INIT_LINE | 0x0); // init line - lcd_remote_write_data(data, 2); - } -} - -#endif - - -void lcd_remote_setmargins(int x, int y) -{ - xmargin = x; - ymargin = y; -} - -int lcd_remote_getxmargin(void) -{ - return xmargin; -} - -int lcd_remote_getymargin(void) -{ - return ymargin; -} - - -void lcd_remote_setfont(int newfont) -{ - curfont = newfont; -} - -int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h) -{ - return font_getstringsize(str, w, h, curfont); -} - -/* put a string at a given char position */ -void lcd_remote_puts(int x, int y, const unsigned char *str) -{ - lcd_remote_puts_style(x, y, str, STYLE_DEFAULT); -} - -void lcd_remote_puts_style(int x, int y, const unsigned char *str, int style) -{ - int xpos,ypos,w,h; - - /* make sure scrolling is turned off on the line we are updating */ - //scrolling_lines &= ~(1 << y); - - if(!str || !str[0]) - return; - - lcd_remote_getstringsize(str, &w, &h); - xpos = xmargin + x*w / strlen(str); - ypos = ymargin + y*h; - lcd_remote_putsxy(xpos, ypos, str); - lcd_remote_clearrect(xpos + w, ypos, LCD_REMOTE_WIDTH - (xpos + w), h); - if (style & STYLE_INVERT) - lcd_remote_invertrect(xpos, ypos, LCD_REMOTE_WIDTH - xpos, h); - -} - /* put a string at a given pixel position, skipping first ofs pixel columns */ static void lcd_remote_putsxyofs(int x, int y, int ofs, const unsigned char *str) { @@ -703,47 +870,36 @@ void lcd_remote_putsxy(int x, int y, const unsigned char *str) lcd_remote_putsxyofs(x, y, 0, str); } +/*** line oriented text output ***/ -/* - * Clear a rectangular area at (x, y), size (nx, ny) - */ -void lcd_remote_clearrect (int x, int y, int nx, int ny) +/* put a string at a given char position */ +void lcd_remote_puts(int x, int y, const unsigned char *str) { - int i; - for (i = 0; i < nx; i++) - lcd_remote_bitmap (zeros, x+i, y, 1, ny, true); + lcd_remote_puts_style(x, y, str, STYLE_DEFAULT); } -/* - * Fill a rectangular area at (x, y), size (nx, ny) - */ -void lcd_remote_fillrect (int x, int y, int nx, int ny) +void lcd_remote_puts_style(int x, int y, const unsigned char *str, int style) { - int i; - for (i = 0; i < nx; i++) - lcd_remote_bitmap (ones, x+i, y, 1, ny, true); -} + int xpos,ypos,w,h; -/* Invert a rectangular area at (x, y), size (nx, ny) */ -void lcd_remote_invertrect (int x, int y, int nx, int ny) -{ - int i, j; + /* make sure scrolling is turned off on the line we are updating */ + //scrolling_lines &= ~(1 << y); - if (x > LCD_REMOTE_WIDTH) - return; - if (y > LCD_REMOTE_HEIGHT) + if(!str || !str[0]) return; - if (x + nx > LCD_REMOTE_WIDTH) - nx = LCD_REMOTE_WIDTH - x; - if (y + ny > LCD_REMOTE_HEIGHT) - ny = LCD_REMOTE_HEIGHT - y; + lcd_remote_getstringsize(str, &w, &h); + xpos = xmargin + x*w / strlen(str); + ypos = ymargin + y*h; + lcd_remote_putsxy(xpos, ypos, str); + lcd_remote_clearrect(xpos + w, ypos, LCD_REMOTE_WIDTH - (xpos + w), h); + if (style & STYLE_INVERT) + lcd_remote_invertrect(xpos, ypos, LCD_REMOTE_WIDTH - xpos, h); - for (i = 0; i < nx; i++) - for (j = 0; j < ny; j++) - REMOTE_INVERT_PIXEL((x + i), (y + j)); } +/*** scrolling ***/ + /* Reverse the invert setting of the scrolling line (if any) at given char position. Setting will go into affect next time line scrolls. */ void lcd_remote_invertscroll(int x, int y) @@ -756,168 +912,29 @@ void lcd_remote_invertscroll(int x, int y) s->invert = !s->invert; } -void lcd_remote_drawline( int x1, int y1, int x2, int y2 ) +void lcd_remote_stop_scroll(void) { - int numpixels; - int i; - int deltax, deltay; - int d, dinc1, dinc2; - int x, xinc1, xinc2; - int y, yinc1, yinc2; - - deltax = abs(x2 - x1); - deltay = abs(y2 - y1); - - if(deltax >= deltay) - { - numpixels = deltax; - d = 2 * deltay - deltax; - dinc1 = deltay * 2; - dinc2 = (deltay - deltax) * 2; - xinc1 = 1; - xinc2 = 1; - yinc1 = 0; - yinc2 = 1; - } - else - { - numpixels = deltay; - d = 2 * deltax - deltay; - dinc1 = deltax * 2; - dinc2 = (deltax - deltay) * 2; - xinc1 = 0; - xinc2 = 1; - yinc1 = 1; - yinc2 = 1; - } - numpixels++; /* include endpoints */ - - if(x1 > x2) - { - xinc1 = -xinc1; - xinc2 = -xinc2; - } - - if(y1 > y2) - { - yinc1 = -yinc1; - yinc2 = -yinc2; - } - - x = x1; - y = y1; - - for(i=0; i= deltay) - { - numpixels = deltax; - d = 2 * deltay - deltax; - dinc1 = deltay * 2; - dinc2 = (deltay - deltax) * 2; - xinc1 = 1; - xinc2 = 1; - yinc1 = 0; - yinc2 = 1; - } - else - { - numpixels = deltay; - d = 2 * deltax - deltay; - dinc1 = deltax * 2; - dinc2 = (deltax - deltay) * 2; - xinc1 = 0; - xinc2 = 1; - yinc1 = 1; - yinc2 = 1; - } - numpixels++; /* include endpoints */ - - if(x1 > x2) - { - xinc1 = -xinc1; - xinc2 = -xinc2; - } - - if(y1 > y2) - { - yinc1 = -yinc1; - yinc2 = -yinc2; - } - - x = x1; - y = y1; - - for(i=0; i + * @param int lines - The number of lines that are rolled. + * The value must be 0 <= pixels < LCD_HEIGHT. */ +void lcd_roll(int lines) +{ + char data[2]; + + lines &= LCD_HEIGHT-1; + data[0] = lines & 0xff; + data[1] = lines >> 8; + + lcd_write_command(LCD_CNTL_DISPLAY_START_LINE); + lcd_write_data(data, 2); +} + +#endif /* !SIMULATOR */ + +/* LCD init */ #ifdef SIMULATOR void lcd_init(void) @@ -118,13 +168,9 @@ void lcd_init(void) create_thread(scroll_thread, scroll_stack, sizeof(scroll_stack), scroll_name); } - #else -/* - * Initialize LCD - */ -void lcd_init (void) +void lcd_init(void) { /* GPO35 is the LCD A0 pin GPO46 is LCD RESET */ @@ -170,11 +216,12 @@ void lcd_init (void) sizeof(scroll_stack), scroll_name); } +/*** update functions ***/ /* Performance function that works with an external buffer note that y and height are in 8-pixel units! */ -void lcd_blit (const unsigned char* p_data, int x, int y, int width, - int height, int stride) +void lcd_blit(const unsigned char* p_data, int x, int y, int width, + int height, int stride) { /* Copy display bitmap to hardware */ while (height--) @@ -189,12 +236,10 @@ void lcd_blit (const unsigned char* p_data, int x, int y, int width, } -/* - * Update the display. - * This must be called after all other LCD functions that change the display. - */ -void lcd_update (void) __attribute__ ((section (".icode"))); -void lcd_update (void) +/* Update the display. + This must be called after all other LCD functions that change the display. */ +void lcd_update(void) __attribute__ ((section (".icode"))); +void lcd_update(void) { int y; @@ -209,12 +254,9 @@ void lcd_update (void) } } -/* - * Update a fraction of the display. - */ -void lcd_update_rect (int, int, int, int) __attribute__ ((section (".icode"))); -void lcd_update_rect (int x_start, int y, - int width, int height) +/* Update a fraction of the display. */ +void lcd_update_rect(int, int, int, int) __attribute__ ((section (".icode"))); +void lcd_update_rect(int x_start, int y, int width, int height) { int ymax; @@ -239,64 +281,9 @@ void lcd_update_rect (int x_start, int y, lcd_write_data (&lcd_framebuffer[y][x_start], width); } } +#endif /* !SIMULATOR */ -void lcd_set_contrast(int val) -{ - lcd_write_command_ex(LCD_CNTL_ELECTRONIC_VOLUME, val, -1); -} - -void lcd_set_invert_display(bool yesno) -{ - lcd_write_command(LCD_CNTL_REVERSE | (yesno?1:0)); -} - -/* turn the display upside down (call lcd_update() afterwards) */ -void lcd_set_flip(bool yesno) -{ - if (yesno) - { - lcd_write_command(LCD_CNTL_COLUMN_ADDRESS_DIR | 1); - lcd_write_command(LCD_CNTL_COMMON_OUTPUT_STATUS | 0); - lcd_write_command_ex(LCD_CNTL_DUTY_SET, 0x20, 0); - xoffset = 160 - LCD_WIDTH; /* 160 colums minus the 160 we have */ - } - else - { - lcd_write_command(LCD_CNTL_COLUMN_ADDRESS_DIR | 0); - lcd_write_command(LCD_CNTL_COMMON_OUTPUT_STATUS | 1); - lcd_write_command_ex(LCD_CNTL_DUTY_SET, 0x20, 1); - xoffset = 0; - } -} - -/** - * Rolls up the lcd display by the specified amount of lines. - * Lines that are rolled out over the top of the screen are - * rolled in from the bottom again. This is a hardware - * remapping only and all operations on the lcd are affected. - * -> - * @param int lines - The number of lines that are rolled. - * The value must be 0 <= pixels < LCD_HEIGHT. - */ -void lcd_roll(int lines) -{ - char data[2]; - - lines &= LCD_HEIGHT-1; - data[0] = lines & 0xff; - data[1] = lines >> 8; - - lcd_write_command(LCD_CNTL_DISPLAY_START_LINE); - lcd_write_data(data, 2); -} - -#endif /* SIMULATOR */ - -void lcd_clear_display (void) -{ - memset (lcd_framebuffer, 0, sizeof lcd_framebuffer); - scrolling_lines = 0; -} +/*** parameter handling ***/ void lcd_setmargins(int x, int y) { @@ -324,111 +311,237 @@ int lcd_getstringsize(const unsigned char *str, int *w, int *h) return font_getstringsize(str, w, h, curfont); } -/* put a string at a given char position */ -void lcd_puts(int x, int y, const unsigned char *str) +/*** drawing functions ***/ + +void lcd_clear_display(void) { - lcd_puts_style(x, y, str, STYLE_DEFAULT); + memset (lcd_framebuffer, 0, sizeof lcd_framebuffer); + scrolling_lines = 0; } -void lcd_puts_style(int x, int y, const unsigned char *str, int style) +/* Set a single pixel */ +void lcd_drawpixel(int x, int y) { - int xpos,ypos,w,h; + DRAW_PIXEL(x,y); +} -#if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS) - /* We make the simulator truncate the string if it reaches the right edge, - as otherwise it'll wrap. The real target doesn't wrap. */ +/* Clear a single pixel */ +void lcd_clearpixel(int x, int y) +{ + CLEAR_PIXEL(x,y); +} - char buffer[12]; - if(strlen(str)+x > 11 ) { - strncpy(buffer, str, sizeof buffer); - buffer[11-x]=0; - str = buffer; +/* Invert a single pixel */ +void lcd_invertpixel(int x, int y) +{ + INVERT_PIXEL(x,y); +} + +void lcd_drawline(int x1, int y1, int x2, int y2) +{ + int numpixels; + int i; + int deltax, deltay; + int d, dinc1, dinc2; + int x, xinc1, xinc2; + int y, yinc1, yinc2; + + deltax = abs(x2 - x1); + deltay = abs(y2 - y1); + + if(deltax >= deltay) + { + numpixels = deltax; + d = 2 * deltay - deltax; + dinc1 = deltay * 2; + dinc2 = (deltay - deltax) * 2; + xinc1 = 1; + xinc2 = 1; + yinc1 = 0; + yinc2 = 1; } - xmargin = 0; - ymargin = 8; -#endif + else + { + numpixels = deltay; + d = 2 * deltax - deltay; + dinc1 = deltax * 2; + dinc2 = (deltax - deltay) * 2; + xinc1 = 0; + xinc2 = 1; + yinc1 = 1; + yinc2 = 1; + } + numpixels++; /* include endpoints */ - /* make sure scrolling is turned off on the line we are updating */ - scrolling_lines &= ~(1 << y); + if(x1 > x2) + { + xinc1 = -xinc1; + xinc2 = -xinc2; + } - if(!str || !str[0]) + if(y1 > y2) + { + yinc1 = -yinc1; + yinc2 = -yinc2; + } + + x = x1; + y = y1; + + for(i=0; i= deltay) + { + numpixels = deltax; + d = 2 * deltay - deltax; + dinc1 = deltay * 2; + dinc2 = (deltay - deltax) * 2; + xinc1 = 1; + xinc2 = 1; + yinc1 = 0; + yinc2 = 1; + } + else + { + numpixels = deltay; + d = 2 * deltax - deltay; + dinc1 = deltax * 2; + dinc2 = (deltax - deltay) * 2; + xinc1 = 0; + xinc2 = 1; + yinc1 = 1; + yinc2 = 1; + } + numpixels++; /* include endpoints */ + + if(x1 > x2) + { + xinc1 = -xinc1; + xinc2 = -xinc2; + } + + if(y1 > y2) + { + yinc1 = -yinc1; + yinc2 = -yinc2; + } + + x = x1; + y = y1; + + for(i=0; i LCD_WIDTH) + return; + if (y > LCD_HEIGHT) return; - lcd_getstringsize(str, &w, &h); - xpos = xmargin + x*w / strlen(str); - ypos = ymargin + y*h; - lcd_putsxy(xpos, ypos, str); - lcd_clearrect(xpos + w, ypos, LCD_WIDTH - (xpos + w), h); - if (style & STYLE_INVERT) - lcd_invertrect(xpos, ypos, LCD_WIDTH - xpos, h); + if (x + nx > LCD_WIDTH) + nx = LCD_WIDTH - x; + if (y + ny > LCD_HEIGHT) + ny = LCD_HEIGHT - y; -#if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS) - lcd_update(); -#endif -} + /* vertical lines */ + for (i = 0; i < ny; i++) { + DRAW_PIXEL(x, (y + i)); + DRAW_PIXEL((x + nx - 1), (y + i)); + } -/* put a string at a given pixel position, skipping first ofs pixel columns */ -static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str) -{ - int ch; - struct font* pf = font_get(curfont); - - while ((ch = *str++) != '\0' && x < LCD_WIDTH) - { - int gwidth, width; - - /* check input range */ - if (ch < pf->firstchar || ch >= pf->firstchar+pf->size) - ch = pf->defaultchar; - ch -= pf->firstchar; - - /* get proportional width and glyph bits */ - gwidth = pf->width ? pf->width[ch] : pf->maxwidth; - width = MIN (gwidth, LCD_WIDTH - x); - - if (ofs != 0) - { - if (ofs > width) - { - ofs -= width; - continue; - } - width -= ofs; - } - - if (width > 0) - { - unsigned int i; - const unsigned char* bits = pf->bits + - (pf->offset ? pf->offset[ch] - : ((pf->height + 7) / 8 * pf->maxwidth * ch)); - - if (ofs != 0) - { - for (i = 0; i < pf->height; i += 8) - { - lcd_bitmap (bits + ofs, x, y + i, width, - MIN(8, pf->height - i), true); - bits += gwidth; - } - } - else - lcd_bitmap ((unsigned char*) bits, x, y, gwidth, - pf->height, true); - x += width; - } - ofs = 0; + /* horizontal lines */ + for (i = 0; i < nx; i++) { + DRAW_PIXEL((x + i),y); + DRAW_PIXEL((x + i),(y + ny - 1)); } } -/* put a string at a given pixel position */ -void lcd_putsxy(int x, int y, const unsigned char *str) +/* Clear a rectangular area at (x, y), size (nx, ny) */ +void lcd_clearrect(int x, int y, int nx, int ny) { - lcd_putsxyofs(x, y, 0, str); + int i; + for (i = 0; i < nx; i++) + lcd_bitmap (zeros, x+i, y, 1, ny, true); } -/* - * About Rockbox' internal bitmap format: +/* Fill a rectangular area at (x, y), size (nx, ny) */ +void lcd_fillrect(int x, int y, int nx, int ny) +{ + int i; + for (i = 0; i < nx; i++) + lcd_bitmap (ones, x+i, y, 1, ny, true); +} + +/* Invert a rectangular area at (x, y), size (nx, ny) */ +void lcd_invertrect(int x, int y, int nx, int ny) +{ + int i, j; + + if (x > LCD_WIDTH) + return; + if (y > LCD_HEIGHT) + return; + + if (x + nx > LCD_WIDTH) + nx = LCD_WIDTH - x; + if (y + ny > LCD_HEIGHT) + ny = LCD_HEIGHT - y; + + for (i = 0; i < nx; i++) + for (j = 0; j < ny; j++) + INVERT_PIXEL((x + i), (y + j)); +} + +/* About Rockbox' internal bitmap format: * * A bitmap contains one bit for every pixel that defines if that pixel is * black (1) or white (0). Bits within a byte are arranged vertically, LSB @@ -437,17 +550,14 @@ void lcd_putsxy(int x, int y, const unsigned char *str) * byte 1 2nd from left etc. The first row of bytes defines pixel rows * 0..7, the second row defines pixel row 8..15 etc. * - * This is the same as the internal lcd hw format. - */ + * This is the same as the internal lcd hw format. */ -/* - * Draw a bitmap at (x, y), size (nx, ny) - * if 'clear' is true, clear destination area first - */ -void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny, - bool clear) __attribute__ ((section (".icode"))); -void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny, - bool clear) +/* Draw a bitmap at (x, y), size (nx, ny) + if 'clear' is true, clear destination area first */ +void lcd_bitmap(const unsigned char *src, int x, int y, int nx, int ny, + bool clear) __attribute__ ((section (".icode"))); +void lcd_bitmap(const unsigned char *src, int x, int y, int nx, int ny, + bool clear) { const unsigned char *src_col; unsigned char *dst, *dst_col; @@ -531,77 +641,95 @@ void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny, } } -/* - * Draw a rectangle with upper left corner at (x, y) - * and size (nx, ny) - */ -void lcd_drawrect (int x, int y, int nx, int ny) +/* put a string at a given pixel position, skipping first ofs pixel columns */ +static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str) { - int i; + int ch; + struct font* pf = font_get(curfont); - if (x > LCD_WIDTH) - return; - if (y > LCD_HEIGHT) - return; + while ((ch = *str++) != '\0' && x < LCD_WIDTH) + { + int gwidth, width; - if (x + nx > LCD_WIDTH) - nx = LCD_WIDTH - x; - if (y + ny > LCD_HEIGHT) - ny = LCD_HEIGHT - y; + /* check input range */ + if (ch < pf->firstchar || ch >= pf->firstchar+pf->size) + ch = pf->defaultchar; + ch -= pf->firstchar; - /* vertical lines */ - for (i = 0; i < ny; i++) { - DRAW_PIXEL(x, (y + i)); - DRAW_PIXEL((x + nx - 1), (y + i)); - } + /* get proportional width and glyph bits */ + gwidth = pf->width ? pf->width[ch] : pf->maxwidth; + width = MIN (gwidth, LCD_WIDTH - x); - /* horizontal lines */ - for (i = 0; i < nx; i++) { - DRAW_PIXEL((x + i),y); - DRAW_PIXEL((x + i),(y + ny - 1)); + if (ofs != 0) + { + if (ofs > width) + { + ofs -= width; + continue; + } + width -= ofs; + } + + if (width > 0) + { + unsigned int i; + const unsigned char* bits = pf->bits + + (pf->offset ? pf->offset[ch] + : ((pf->height + 7) / 8 * pf->maxwidth * ch)); + + if (ofs != 0) + { + for (i = 0; i < pf->height; i += 8) + { + lcd_bitmap (bits + ofs, x, y + i, width, + MIN(8, pf->height - i), true); + bits += gwidth; + } + } + else + lcd_bitmap ((unsigned char*) bits, x, y, gwidth, + pf->height, true); + x += width; + } + ofs = 0; } } -/* - * Clear a rectangular area at (x, y), size (nx, ny) - */ -void lcd_clearrect (int x, int y, int nx, int ny) +/* put a string at a given pixel position */ +void lcd_putsxy(int x, int y, const unsigned char *str) { - int i; - for (i = 0; i < nx; i++) - lcd_bitmap (zeros, x+i, y, 1, ny, true); + lcd_putsxyofs(x, y, 0, str); } -/* - * Fill a rectangular area at (x, y), size (nx, ny) - */ -void lcd_fillrect (int x, int y, int nx, int ny) -{ - int i; - for (i = 0; i < nx; i++) - lcd_bitmap (ones, x+i, y, 1, ny, true); -} +/*** line oriented text output ***/ -/* Invert a rectangular area at (x, y), size (nx, ny) */ -void lcd_invertrect (int x, int y, int nx, int ny) +void lcd_puts_style(int x, int y, const unsigned char *str, int style) { - int i, j; + int xpos,ypos,w,h; - if (x > LCD_WIDTH) - return; - if (y > LCD_HEIGHT) + /* make sure scrolling is turned off on the line we are updating */ + scrolling_lines &= ~(1 << y); + + if(!str || !str[0]) return; - if (x + nx > LCD_WIDTH) - nx = LCD_WIDTH - x; - if (y + ny > LCD_HEIGHT) - ny = LCD_HEIGHT - y; - - for (i = 0; i < nx; i++) - for (j = 0; j < ny; j++) - INVERT_PIXEL((x + i), (y + j)); + lcd_getstringsize(str, &w, &h); + xpos = xmargin + x*w / strlen(str); + ypos = ymargin + y*h; + lcd_putsxy(xpos, ypos, str); + lcd_clearrect(xpos + w, ypos, LCD_WIDTH - (xpos + w), h); + if (style & STYLE_INVERT) + lcd_invertrect(xpos, ypos, LCD_WIDTH - xpos, h); } +/* put a string at a given char position */ +void lcd_puts(int x, int y, const unsigned char *str) +{ + lcd_puts_style(x, y, str, STYLE_DEFAULT); +} + +/*** scrolling ***/ + /* Reverse the invert setting of the scrolling line (if any) at given char position. Setting will go into affect next time line scrolls. */ void lcd_invertscroll(int x, int y) @@ -614,168 +742,29 @@ void lcd_invertscroll(int x, int y) s->invert = !s->invert; } -void lcd_drawline( int x1, int y1, int x2, int y2 ) +void lcd_stop_scroll(void) { - int numpixels; - int i; - int deltax, deltay; - int d, dinc1, dinc2; - int x, xinc1, xinc2; - int y, yinc1, yinc2; - - deltax = abs(x2 - x1); - deltay = abs(y2 - y1); - - if(deltax >= deltay) - { - numpixels = deltax; - d = 2 * deltay - deltax; - dinc1 = deltay * 2; - dinc2 = (deltay - deltax) * 2; - xinc1 = 1; - xinc2 = 1; - yinc1 = 0; - yinc2 = 1; - } - else - { - numpixels = deltay; - d = 2 * deltax - deltay; - dinc1 = deltax * 2; - dinc2 = (deltax - deltay) * 2; - xinc1 = 0; - xinc2 = 1; - yinc1 = 1; - yinc2 = 1; - } - numpixels++; /* include endpoints */ - - if(x1 > x2) - { - xinc1 = -xinc1; - xinc2 = -xinc2; - } - - if(y1 > y2) - { - yinc1 = -yinc1; - yinc2 = -yinc2; - } - - x = x1; - y = y1; - - for(i=0; i= deltay) - { - numpixels = deltax; - d = 2 * deltay - deltax; - dinc1 = deltay * 2; - dinc2 = (deltay - deltax) * 2; - xinc1 = 1; - xinc2 = 1; - yinc1 = 0; - yinc2 = 1; - } - else - { - numpixels = deltay; - d = 2 * deltax - deltay; - dinc1 = deltax * 2; - dinc2 = (deltax - deltay) * 2; - xinc1 = 0; - xinc2 = 1; - yinc1 = 1; - yinc2 = 1; - } - numpixels++; /* include endpoints */ - - if(x1 > x2) - { - xinc1 = -xinc1; - xinc2 = -xinc2; - } - - if(y1 > y2) - { - yinc1 = -yinc1; - yinc2 = -yinc2; - } - - x = x1; - y = y1; - - for(i=0; i all pins normal cmos output - P2 -> pins 1 to 5 normal cmos output. */ - P0CON = 0xff; - P2CONL |= 0x5a; - P2CONL &= 0x5b; - P2CONH |= 1; -#else - /* Initialize PB0-3 as output pins */ - PBCR2 &= 0xff00; /* MD = 00 */ - PBIOR |= 0x000f; /* IOR = 1 */ -#endif - - /* inits like the original firmware */ - lcd_write_command(LCD_SOFTWARE_RESET); - lcd_write_command(LCD_SET_INTERNAL_REGULATOR_RESISTOR_RATIO + 4); - lcd_write_command(LCD_SET_1OVER4_BIAS_RATIO + 0); /* force 1/4 bias: 0 */ - lcd_write_command(LCD_SET_POWER_CONTROL_REGISTER + 7); /* power control register: op-amp=1, regulator=1, booster=1 */ - lcd_write_command(LCD_SET_DISPLAY_ON); - lcd_write_command(LCD_SET_NORMAL_DISPLAY); - lcd_set_flip(false); - lcd_write_command(LCD_SET_DISPLAY_START_LINE + 0); - lcd_set_contrast(lcd_default_contrast()); - lcd_write_command(LCD_SET_PAGE_ADDRESS); - lcd_write_command(LCD_SET_LOWER_COLUMN_ADDRESS + 0); - lcd_write_command(LCD_SET_HIGHER_COLUMN_ADDRESS + 0); - - lcd_clear_display(); - lcd_update(); - create_thread(scroll_thread, scroll_stack, - sizeof(scroll_stack), scroll_name); -} - - -/* Performance function that works with an external buffer - note that y and height are in 8-pixel units! */ -void lcd_blit (const unsigned char* p_data, int x, int y, int width, - int height, int stride) -{ - /* Copy display bitmap to hardware */ - while (height--) - { - lcd_write_command (LCD_CNTL_PAGE | (y++ & 0xf)); - lcd_write_command (LCD_CNTL_HIGHCOL | (((x+xoffset)>>4) & 0xf)); - lcd_write_command (LCD_CNTL_LOWCOL | ((x+xoffset) & 0xf)); - - lcd_write_data(p_data, width); - p_data += stride; - } -} - - -/* - * Update the display. - * This must be called after all other LCD functions that change the display. - */ -void lcd_update (void) __attribute__ ((section (".icode"))); -void lcd_update (void) -{ - int y; - - /* Copy display bitmap to hardware */ - for (y = 0; y < LCD_HEIGHT/8; y++) - { - lcd_write_command (LCD_CNTL_PAGE | (y & 0xf)); - lcd_write_command (LCD_CNTL_HIGHCOL | ((xoffset>>4) & 0xf)); - lcd_write_command (LCD_CNTL_LOWCOL | (xoffset & 0xf)); - - lcd_write_data (lcd_framebuffer[y], LCD_WIDTH); - } -} - -/* - * Update a fraction of the display. - */ -void lcd_update_rect (int, int, int, int) __attribute__ ((section (".icode"))); -void lcd_update_rect (int x_start, int y, - int width, int height) -{ - int ymax; - - /* The Y coordinates have to work on even 8 pixel rows */ - ymax = (y + height-1)/8; - y /= 8; - - if(x_start + width > LCD_WIDTH) - width = LCD_WIDTH - x_start; - if (width <= 0) - return; /* nothing left to do, 0 is harmful to lcd_write_data() */ - if(ymax >= LCD_HEIGHT/8) - ymax = LCD_HEIGHT/8-1; - - /* Copy specified rectange bitmap to hardware */ - for (; y <= ymax; y++) - { - lcd_write_command (LCD_CNTL_PAGE | (y & 0xf)); - lcd_write_command (LCD_CNTL_HIGHCOL | (((x_start+xoffset)>>4) & 0xf)); - lcd_write_command (LCD_CNTL_LOWCOL | ((x_start+xoffset) & 0xf)); - - lcd_write_data (&lcd_framebuffer[y][x_start], width); - } -} +#ifndef SIMULATOR void lcd_set_contrast(int val) { @@ -301,7 +181,9 @@ void lcd_set_flip(bool yesno) lcd_write_command(LCD_SET_SEGMENT_REMAP | 0x01); lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION | 0x08); xoffset = 132 - LCD_WIDTH; - } else { + } + else + { lcd_write_command(LCD_SET_SEGMENT_REMAP); lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION | 0x08); xoffset = 0; @@ -322,27 +204,136 @@ void lcd_set_flip(bool yesno) #endif } -/** - * Rolls up the lcd display by the specified amount of lines. +/* Rolls up the lcd display by the specified amount of lines. * Lines that are rolled out over the top of the screen are * rolled in from the bottom again. This is a hardware * remapping only and all operations on the lcd are affected. * -> * @param int lines - The number of lines that are rolled. - * The value must be 0 <= pixels < LCD_HEIGHT. - */ + * The value must be 0 <= pixels < LCD_HEIGHT. */ void lcd_roll(int lines) { lcd_write_command(LCD_SET_DISPLAY_START_LINE | (lines & (LCD_HEIGHT-1))); } -#endif /* SIMULATOR */ +#endif /* !SIMULATOR */ -void lcd_clear_display (void) +/* LCD init */ +#ifdef SIMULATOR + +void lcd_init(void) { - memset (lcd_framebuffer, 0, sizeof lcd_framebuffer); - scrolling_lines = 0; + create_thread(scroll_thread, scroll_stack, + sizeof(scroll_stack), scroll_name); } +#else + +void lcd_init(void) +{ +#if CONFIG_CPU == TCC730 + /* Initialise P0 & some P2 output pins: + P0 -> all pins normal cmos output + P2 -> pins 1 to 5 normal cmos output. */ + P0CON = 0xff; + P2CONL |= 0x5a; + P2CONL &= 0x5b; + P2CONH |= 1; +#else + /* Initialize PB0-3 as output pins */ + PBCR2 &= 0xff00; /* MD = 00 */ + PBIOR |= 0x000f; /* IOR = 1 */ +#endif + + /* inits like the original firmware */ + lcd_write_command(LCD_SOFTWARE_RESET); + lcd_write_command(LCD_SET_INTERNAL_REGULATOR_RESISTOR_RATIO + 4); + lcd_write_command(LCD_SET_1OVER4_BIAS_RATIO + 0); /* force 1/4 bias: 0 */ + lcd_write_command(LCD_SET_POWER_CONTROL_REGISTER + 7); + /* power control register: op-amp=1, regulator=1, booster=1 */ + lcd_write_command(LCD_SET_DISPLAY_ON); + lcd_write_command(LCD_SET_NORMAL_DISPLAY); + lcd_set_flip(false); + lcd_write_command(LCD_SET_DISPLAY_START_LINE + 0); + lcd_set_contrast(lcd_default_contrast()); + lcd_write_command(LCD_SET_PAGE_ADDRESS); + lcd_write_command(LCD_SET_LOWER_COLUMN_ADDRESS + 0); + lcd_write_command(LCD_SET_HIGHER_COLUMN_ADDRESS + 0); + + lcd_clear_display(); + lcd_update(); + + create_thread(scroll_thread, scroll_stack, + sizeof(scroll_stack), scroll_name); +} + +/*** Update functions ***/ + +/* Performance function that works with an external buffer + note that y and height are in 8-pixel units! */ +void lcd_blit(const unsigned char* p_data, int x, int y, int width, + int height, int stride) +{ + /* Copy display bitmap to hardware */ + while (height--) + { + lcd_write_command (LCD_CNTL_PAGE | (y++ & 0xf)); + lcd_write_command (LCD_CNTL_HIGHCOL | (((x+xoffset)>>4) & 0xf)); + lcd_write_command (LCD_CNTL_LOWCOL | ((x+xoffset) & 0xf)); + + lcd_write_data(p_data, width); + p_data += stride; + } +} + + +/* Update the display. + This must be called after all other LCD functions that change the display. */ +void lcd_update(void) __attribute__ ((section (".icode"))); +void lcd_update(void) +{ + int y; + + /* Copy display bitmap to hardware */ + for (y = 0; y < LCD_HEIGHT/8; y++) + { + lcd_write_command (LCD_CNTL_PAGE | (y & 0xf)); + lcd_write_command (LCD_CNTL_HIGHCOL | ((xoffset>>4) & 0xf)); + lcd_write_command (LCD_CNTL_LOWCOL | (xoffset & 0xf)); + + lcd_write_data (lcd_framebuffer[y], LCD_WIDTH); + } +} + +/* Update a fraction of the display. */ +void lcd_update_rect(int, int, int, int) __attribute__ ((section (".icode"))); +void lcd_update_rect(int x_start, int y, int width, int height) +{ + int ymax; + + /* The Y coordinates have to work on even 8 pixel rows */ + ymax = (y + height-1)/8; + y /= 8; + + if(x_start + width > LCD_WIDTH) + width = LCD_WIDTH - x_start; + if (width <= 0) + return; /* nothing left to do, 0 is harmful to lcd_write_data() */ + if(ymax >= LCD_HEIGHT/8) + ymax = LCD_HEIGHT/8-1; + + /* Copy specified rectange bitmap to hardware */ + for (; y <= ymax; y++) + { + lcd_write_command (LCD_CNTL_PAGE | (y & 0xf)); + lcd_write_command (LCD_CNTL_HIGHCOL | (((x_start+xoffset)>>4) & 0xf)); + lcd_write_command (LCD_CNTL_LOWCOL | ((x_start+xoffset) & 0xf)); + + lcd_write_data (&lcd_framebuffer[y][x_start], width); + } +} +#endif /* !SIMULATOR */ + +/*** parameter handling ***/ void lcd_setmargins(int x, int y) { @@ -370,111 +361,237 @@ int lcd_getstringsize(const unsigned char *str, int *w, int *h) return font_getstringsize(str, w, h, curfont); } -/* put a string at a given char position */ -void lcd_puts(int x, int y, const unsigned char *str) +/*** drawing functions ***/ + +void lcd_clear_display(void) { - lcd_puts_style(x, y, str, STYLE_DEFAULT); + memset (lcd_framebuffer, 0, sizeof lcd_framebuffer); + scrolling_lines = 0; } -void lcd_puts_style(int x, int y, const unsigned char *str, int style) +/* Set a single pixel */ +void lcd_drawpixel(int x, int y) { - int xpos,ypos,w,h; + DRAW_PIXEL(x,y); +} -#if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS) - /* We make the simulator truncate the string if it reaches the right edge, - as otherwise it'll wrap. The real target doesn't wrap. */ +/* Clear a single pixel */ +void lcd_clearpixel(int x, int y) +{ + CLEAR_PIXEL(x,y); +} - char buffer[12]; - if(strlen(str)+x > 11 ) { - strncpy(buffer, str, sizeof buffer); - buffer[11-x]=0; - str = buffer; +/* Invert a single pixel */ +void lcd_invertpixel(int x, int y) +{ + INVERT_PIXEL(x,y); +} + +void lcd_drawline(int x1, int y1, int x2, int y2) +{ + int numpixels; + int i; + int deltax, deltay; + int d, dinc1, dinc2; + int x, xinc1, xinc2; + int y, yinc1, yinc2; + + deltax = abs(x2 - x1); + deltay = abs(y2 - y1); + + if(deltax >= deltay) + { + numpixels = deltax; + d = 2 * deltay - deltax; + dinc1 = deltay * 2; + dinc2 = (deltay - deltax) * 2; + xinc1 = 1; + xinc2 = 1; + yinc1 = 0; + yinc2 = 1; } - xmargin = 0; - ymargin = 8; -#endif + else + { + numpixels = deltay; + d = 2 * deltax - deltay; + dinc1 = deltax * 2; + dinc2 = (deltax - deltay) * 2; + xinc1 = 0; + xinc2 = 1; + yinc1 = 1; + yinc2 = 1; + } + numpixels++; /* include endpoints */ - /* make sure scrolling is turned off on the line we are updating */ - scrolling_lines &= ~(1 << y); + if(x1 > x2) + { + xinc1 = -xinc1; + xinc2 = -xinc2; + } - if(!str || !str[0]) + if(y1 > y2) + { + yinc1 = -yinc1; + yinc2 = -yinc2; + } + + x = x1; + y = y1; + + for(i=0; i= deltay) + { + numpixels = deltax; + d = 2 * deltay - deltax; + dinc1 = deltay * 2; + dinc2 = (deltay - deltax) * 2; + xinc1 = 1; + xinc2 = 1; + yinc1 = 0; + yinc2 = 1; + } + else + { + numpixels = deltay; + d = 2 * deltax - deltay; + dinc1 = deltax * 2; + dinc2 = (deltax - deltay) * 2; + xinc1 = 0; + xinc2 = 1; + yinc1 = 1; + yinc2 = 1; + } + numpixels++; /* include endpoints */ + + if(x1 > x2) + { + xinc1 = -xinc1; + xinc2 = -xinc2; + } + + if(y1 > y2) + { + yinc1 = -yinc1; + yinc2 = -yinc2; + } + + x = x1; + y = y1; + + for(i=0; i LCD_WIDTH) + return; + if (y > LCD_HEIGHT) return; - lcd_getstringsize(str, &w, &h); - xpos = xmargin + x*w / strlen(str); - ypos = ymargin + y*h; - lcd_putsxy(xpos, ypos, str); - lcd_clearrect(xpos + w, ypos, LCD_WIDTH - (xpos + w), h); - if (style & STYLE_INVERT) - lcd_invertrect(xpos, ypos, LCD_WIDTH - xpos, h); + if (x + nx > LCD_WIDTH) + nx = LCD_WIDTH - x; + if (y + ny > LCD_HEIGHT) + ny = LCD_HEIGHT - y; -#if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS) - lcd_update(); -#endif -} + /* vertical lines */ + for (i = 0; i < ny; i++) { + DRAW_PIXEL(x, (y + i)); + DRAW_PIXEL((x + nx - 1), (y + i)); + } -/* put a string at a given pixel position, skipping first ofs pixel columns */ -static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str) -{ - int ch; - struct font* pf = font_get(curfont); - - while ((ch = *str++) != '\0' && x < LCD_WIDTH) - { - int gwidth, width; - - /* check input range */ - if (ch < pf->firstchar || ch >= pf->firstchar+pf->size) - ch = pf->defaultchar; - ch -= pf->firstchar; - - /* get proportional width and glyph bits */ - gwidth = pf->width ? pf->width[ch] : pf->maxwidth; - width = MIN (gwidth, LCD_WIDTH - x); - - if (ofs != 0) - { - if (ofs > width) - { - ofs -= width; - continue; - } - width -= ofs; - } - - if (width > 0) - { - unsigned int i; - const unsigned char* bits = pf->bits + - (pf->offset ? pf->offset[ch] - : ((pf->height + 7) / 8 * pf->maxwidth * ch)); - - if (ofs != 0) - { - for (i = 0; i < pf->height; i += 8) - { - lcd_bitmap (bits + ofs, x, y + i, width, - MIN(8, pf->height - i), true); - bits += gwidth; - } - } - else - lcd_bitmap ((unsigned char*) bits, x, y, gwidth, - pf->height, true); - x += width; - } - ofs = 0; + /* horizontal lines */ + for (i = 0; i < nx; i++) { + DRAW_PIXEL((x + i),y); + DRAW_PIXEL((x + i),(y + ny - 1)); } } -/* put a string at a given pixel position */ -void lcd_putsxy(int x, int y, const unsigned char *str) +/* Clear a rectangular area at (x, y), size (nx, ny) */ +void lcd_clearrect(int x, int y, int nx, int ny) { - lcd_putsxyofs(x, y, 0, str); + int i; + for (i = 0; i < nx; i++) + lcd_bitmap(zeros, x+i, y, 1, ny, true); } -/* - * About Rockbox' internal bitmap format: +/* Fill a rectangular area at (x, y), size (nx, ny) */ +void lcd_fillrect(int x, int y, int nx, int ny) +{ + int i; + for (i = 0; i < nx; i++) + lcd_bitmap(ones, x+i, y, 1, ny, true); +} + +/* Invert a rectangular area at (x, y), size (nx, ny) */ +void lcd_invertrect(int x, int y, int nx, int ny) +{ + int i, j; + + if (x > LCD_WIDTH) + return; + if (y > LCD_HEIGHT) + return; + + if (x + nx > LCD_WIDTH) + nx = LCD_WIDTH - x; + if (y + ny > LCD_HEIGHT) + ny = LCD_HEIGHT - y; + + for (i = 0; i < nx; i++) + for (j = 0; j < ny; j++) + INVERT_PIXEL((x + i), (y + j)); +} + +/* About Rockbox' internal bitmap format: * * A bitmap contains one bit for every pixel that defines if that pixel is * black (1) or white (0). Bits within a byte are arranged vertically, LSB @@ -483,17 +600,14 @@ void lcd_putsxy(int x, int y, const unsigned char *str) * byte 1 2nd from left etc. The first row of bytes defines pixel rows * 0..7, the second row defines pixel row 8..15 etc. * - * This is the same as the internal lcd hw format. - */ + * This is the same as the internal lcd hw format. */ -/* - * Draw a bitmap at (x, y), size (nx, ny) - * if 'clear' is true, clear destination area first - */ -void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny, - bool clear) __attribute__ ((section (".icode"))); -void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny, - bool clear) +/* Draw a bitmap at (x, y), size (nx, ny) + if 'clear' is true, clear destination area first */ +void lcd_bitmap(const unsigned char *src, int x, int y, int nx, int ny, + bool clear) __attribute__ ((section (".icode"))); +void lcd_bitmap(const unsigned char *src, int x, int y, int nx, int ny, + bool clear) { const unsigned char *src_col; unsigned char *dst, *dst_col; @@ -577,77 +691,95 @@ void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny, } } -/* - * Draw a rectangle with upper left corner at (x, y) - * and size (nx, ny) - */ -void lcd_drawrect (int x, int y, int nx, int ny) +/* put a string at a given pixel position, skipping first ofs pixel columns */ +static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str) { - int i; + int ch; + struct font* pf = font_get(curfont); - if (x > LCD_WIDTH) - return; - if (y > LCD_HEIGHT) - return; + while ((ch = *str++) != '\0' && x < LCD_WIDTH) + { + int gwidth, width; - if (x + nx > LCD_WIDTH) - nx = LCD_WIDTH - x; - if (y + ny > LCD_HEIGHT) - ny = LCD_HEIGHT - y; + /* check input range */ + if (ch < pf->firstchar || ch >= pf->firstchar+pf->size) + ch = pf->defaultchar; + ch -= pf->firstchar; - /* vertical lines */ - for (i = 0; i < ny; i++) { - DRAW_PIXEL(x, (y + i)); - DRAW_PIXEL((x + nx - 1), (y + i)); - } + /* get proportional width and glyph bits */ + gwidth = pf->width ? pf->width[ch] : pf->maxwidth; + width = MIN (gwidth, LCD_WIDTH - x); - /* horizontal lines */ - for (i = 0; i < nx; i++) { - DRAW_PIXEL((x + i),y); - DRAW_PIXEL((x + i),(y + ny - 1)); + if (ofs != 0) + { + if (ofs > width) + { + ofs -= width; + continue; + } + width -= ofs; + } + + if (width > 0) + { + unsigned int i; + const unsigned char* bits = pf->bits + + (pf->offset ? pf->offset[ch] + : ((pf->height + 7) / 8 * pf->maxwidth * ch)); + + if (ofs != 0) + { + for (i = 0; i < pf->height; i += 8) + { + lcd_bitmap (bits + ofs, x, y + i, width, + MIN(8, pf->height - i), true); + bits += gwidth; + } + } + else + lcd_bitmap ((unsigned char*) bits, x, y, gwidth, + pf->height, true); + x += width; + } + ofs = 0; } } -/* - * Clear a rectangular area at (x, y), size (nx, ny) - */ -void lcd_clearrect (int x, int y, int nx, int ny) +/* put a string at a given pixel position */ +void lcd_putsxy(int x, int y, const unsigned char *str) { - int i; - for (i = 0; i < nx; i++) - lcd_bitmap (zeros, x+i, y, 1, ny, true); + lcd_putsxyofs(x, y, 0, str); } -/* - * Fill a rectangular area at (x, y), size (nx, ny) - */ -void lcd_fillrect (int x, int y, int nx, int ny) -{ - int i; - for (i = 0; i < nx; i++) - lcd_bitmap (ones, x+i, y, 1, ny, true); -} +/*** Line oriented text output ***/ -/* Invert a rectangular area at (x, y), size (nx, ny) */ -void lcd_invertrect (int x, int y, int nx, int ny) +void lcd_puts_style(int x, int y, const unsigned char *str, int style) { - int i, j; + int xpos,ypos,w,h; - if (x > LCD_WIDTH) - return; - if (y > LCD_HEIGHT) + /* make sure scrolling is turned off on the line we are updating */ + scrolling_lines &= ~(1 << y); + + if(!str || !str[0]) return; - if (x + nx > LCD_WIDTH) - nx = LCD_WIDTH - x; - if (y + ny > LCD_HEIGHT) - ny = LCD_HEIGHT - y; - - for (i = 0; i < nx; i++) - for (j = 0; j < ny; j++) - INVERT_PIXEL((x + i), (y + j)); + lcd_getstringsize(str, &w, &h); + xpos = xmargin + x*w / strlen(str); + ypos = ymargin + y*h; + lcd_putsxy(xpos, ypos, str); + lcd_clearrect(xpos + w, ypos, LCD_WIDTH - (xpos + w), h); + if (style & STYLE_INVERT) + lcd_invertrect(xpos, ypos, LCD_WIDTH - xpos, h); } +/* put a string at a given char position */ +void lcd_puts(int x, int y, const unsigned char *str) +{ + lcd_puts_style(x, y, str, STYLE_DEFAULT); +} + +/*** scrolling ***/ + /* Reverse the invert setting of the scrolling line (if any) at given char position. Setting will go into affect next time line scrolls. */ void lcd_invertscroll(int x, int y) @@ -660,168 +792,29 @@ void lcd_invertscroll(int x, int y) s->invert = !s->invert; } -void lcd_drawline( int x1, int y1, int x2, int y2 ) +void lcd_stop_scroll(void) { - int numpixels; - int i; - int deltax, deltay; - int d, dinc1, dinc2; - int x, xinc1, xinc2; - int y, yinc1, yinc2; - - deltax = abs(x2 - x1); - deltay = abs(y2 - y1); - - if(deltax >= deltay) - { - numpixels = deltax; - d = 2 * deltay - deltax; - dinc1 = deltay * 2; - dinc2 = (deltay - deltax) * 2; - xinc1 = 1; - xinc2 = 1; - yinc1 = 0; - yinc2 = 1; - } - else - { - numpixels = deltay; - d = 2 * deltax - deltay; - dinc1 = deltax * 2; - dinc2 = (deltax - deltay) * 2; - xinc1 = 0; - xinc2 = 1; - yinc1 = 1; - yinc2 = 1; - } - numpixels++; /* include endpoints */ - - if(x1 > x2) - { - xinc1 = -xinc1; - xinc2 = -xinc2; - } - - if(y1 > y2) - { - yinc1 = -yinc1; - yinc2 = -yinc2; - } - - x = x1; - y = y1; - - for(i=0; i= deltay) - { - numpixels = deltax; - d = 2 * deltay - deltax; - dinc1 = deltay * 2; - dinc2 = (deltay - deltax) * 2; - xinc1 = 1; - xinc2 = 1; - yinc1 = 0; - yinc2 = 1; - } - else - { - numpixels = deltay; - d = 2 * deltax - deltay; - dinc1 = deltax * 2; - dinc2 = (deltax - deltay) * 2; - xinc1 = 0; - xinc2 = 1; - yinc1 = 1; - yinc2 = 1; - } - numpixels++; /* include endpoints */ - - if(x1 > x2) - { - xinc1 = -xinc1; - xinc2 = -xinc2; - } - - if(y1 > y2) - { - yinc1 = -yinc1; - yinc2 = -yinc2; - } - - x = x1; - y = y1; - - for(i=0; i