Thank you to anyone who has already donated - your generous donations helped make three months of treatment possible.
My brother Nate continues to fight stage IV Hodgkin's lymphoma. He's just 31, with a wife and baby girl. They have no active income (since he's been unable to return to work), no insurance, and cannot afford the treatment he needs. Nate and his family need your help. Please consider a donation, every dollar helps. Thanks.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 |
diff --git a/firmware/SOURCES b/firmware/SOURCES index 3012314..e68f611 100644 target/arm/as3525/sansa-clip/lcd-as-clip.S #ifdef SANSA_E200V2 #ifndef SIMULATOR target/arm/as3525/sansa-e200v2/lcd-e200v2.c +target/arm/as3525/lcd-fuze.c target/arm/as3525/button-e200v2-fuze.c target/arm/as3525/backlight-e200v2-fuze.c target/arm/as3525/dbop-as3525.c diff --git a/firmware/export/hd66789r.h b/firmware/export/hd66789r.h index f0b2c2b..4f0b5b6 100644 #define R_HORIZ_RAM_ADDR_POS 0x44 #define R_VERT_RAM_ADDR_POS 0x45 +/* register settings */ + +/* Color reverse */ +#define R_DISP_CONTROL_NORMAL 0x0004 +#define R_DISP_CONTROL_REV 0x0000 + +#define R_ENTRY_MODE_BGR_HORZ 0x1030 +#define R_ENTRY_MODE_BGR_VERT 0x1038 + + #endif /* _HD66789R_H_ */ diff --git a/firmware/target/arm/as3525/lcd-fuze.c b/firmware/target/arm/as3525/lcd-fuze.c index bb7bc9f..22e3d34 100644 #include "file.h" #include "clock-target.h" #include "dbop-as3525.h" +#include "hd66789r.h" + +#ifdef SANSA_E200V2 +#include "lcd-e200v2.h" +#else /* fuzev1 / fuzev2 */ #include "lcd-fuze.h" +#endif /* SANSA_E200V2 */ /* The controller is unknown, but some registers appear to be the same as the HD66789R */ -static bool display_on = false; /* is the display turned on? */ +static bool display_on = true; /* is the display turned on? */ /* Reverse Flag */ static int r_disp_control_rev = R_DISP_CONTROL_NORMAL; /* Flip flag */ static int r_drv_output_control = R_DRV_OUTPUT_CONTROL_NORMAL; +#ifndef SANSA_E200V2 static int r_gate_scan_pos = R_GATE_SCAN_POS_NORMAL; +#endif static int xoffset = 20; /*** hardware configuration ***/ -void lcd_set_contrast(int val) -{ - (void)val; -} - -void lcd_set_invert_display(bool yesno) -{ - r_disp_control_rev = yesno ? R_DISP_CONTROL_REV : - R_DISP_CONTROL_NORMAL; - - if (display_on) - { - lcd_write_reg(R_DISP_CONTROL1, 0x0013 | r_disp_control_rev); - } - -} - -#ifdef HAVE_LCD_FLIP -/* turn the display upside down */ -void lcd_set_flip(bool yesno) +/* FIXME : find the datasheet for this RENESAS controller so we identify the + * registers used in windowing code (not present in HD66789R) */ +#ifndef SANSA_E200V2 +static void lcd_window(int xmin, int ymin, int xmax, int ymax) { - if (yesno) - { - xoffset = 0; - r_drv_output_control = R_DRV_OUTPUT_CONTROL_FLIPPED; - r_gate_scan_pos = R_GATE_SCAN_POS_FLIPPED; - } - else - { - xoffset = 20; - r_drv_output_control = R_DRV_OUTPUT_CONTROL_NORMAL; - r_gate_scan_pos = R_GATE_SCAN_POS_NORMAL; - } + /* Set horizontal window addresses */ + xmin += xoffset; + xmax += xoffset; + lcd_write_reg(0x46, (xmax << 8) | xmin); + lcd_write_reg(0x20, xmin); - if (display_on) - { - lcd_write_reg(R_GATE_SCAN_POS, r_gate_scan_pos); - lcd_write_reg(R_DRV_OUTPUT_CONTROL, r_drv_output_control); - } + /* Set vertical window addresses */ + lcd_write_reg(0x47, ymax); + lcd_write_reg(0x48, ymin); + lcd_write_reg(R_RAM_ADDR_SET, ymin); } -#endif void fuze_display_on(void) { void fuze_display_on(void) lcd_write_reg(R_POWER_CONTROL4, 0x70); lcd_write_reg(R_DRV_OUTPUT_CONTROL, r_drv_output_control); lcd_write_reg(R_DRV_WAVEFORM_CONTROL, (7<<8)); - lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ); + lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_BGR_HORZ); lcd_write_reg(R_DISP_CONTROL2, 0x01); lcd_write_reg(R_FRAME_CYCLE_CONTROL, (1<<10)); lcd_write_reg(R_EXT_DISP_IF_CONTROL, 0); void fuze_display_on(void) lcd_write_reg(0x48, 0x0); lcd_write_reg(R_DISP_CONTROL1, 0x11); - lcd_write_reg(R_DISP_CONTROL1, 0x13 | r_disp_control_rev); + lcd_write_reg(R_DISP_CONTROL1, R_DISP_CONTROL_DEFAULT | r_disp_control_rev); display_on = true; /* must be done before calling lcd_update() */ lcd_update(); } +#endif /* !E200V2 */ #if defined(HAVE_LCD_ENABLE) void lcd_enable(bool on) void lcd_enable(bool on) lcd_write_reg(R_POWER_CONTROL1, 0x3860); lcd_write_reg(R_POWER_CONTROL4, 0x40); lcd_write_reg(R_POWER_CONTROL4, 0x60); - lcd_write_reg(R_POWER_CONTROL4, 112); + lcd_write_reg(R_POWER_CONTROL4, 0x70); lcd_write_reg(R_DISP_CONTROL1, 0x11); - lcd_write_reg(R_DISP_CONTROL1, 0x13 | r_disp_control_rev); + lcd_write_reg(R_DISP_CONTROL1, R_DISP_CONTROL_DEFAULT | r_disp_control_rev); lcd_write_reg(R_DRV_OUTPUT_CONTROL, r_drv_output_control); +#ifndef SANSA_E200V2 lcd_write_reg(R_GATE_SCAN_POS, r_gate_scan_pos); +#endif display_on = true; lcd_update(); /* Resync display */ send_event(LCD_EVENT_ACTIVATION, NULL); void lcd_enable(bool on) } else { - lcd_write_reg(R_DISP_CONTROL1, 0x22); - lcd_write_reg(R_DISP_CONTROL1, 0); lcd_write_reg(R_POWER_CONTROL1, 1); display_on = false; } } #endif -#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) -bool lcd_active(void) +void lcd_set_invert_display(bool yesno) { - return display_on; -} -#endif + r_disp_control_rev = yesno ? R_DISP_CONTROL_REV : + R_DISP_CONTROL_NORMAL; -/*** update functions ***/ + if (display_on) + { + lcd_write_reg(R_DISP_CONTROL1, 0x0013 | r_disp_control_rev); + } -/* FIXME : find the datasheet for this RENESAS controller so we identify the - * registers used in windowing code (not present in HD66789R) */ +} -/* Set horizontal window addresses */ -static void lcd_window_x(int xmin, int xmax) +#ifdef HAVE_LCD_FLIP +/* turn the display upside down */ +void lcd_set_flip(bool yesno) { - xmin += xoffset; - xmax += xoffset; - lcd_write_reg(0x46, (xmax << 8) | xmin); - lcd_write_reg(0x20, xmin); + if (yesno) + { + xoffset = 0; + r_drv_output_control = R_DRV_OUTPUT_CONTROL_FLIPPED; + } + else + { + xoffset = 20; + r_drv_output_control = R_DRV_OUTPUT_CONTROL_NORMAL; + } +#ifndef SANSA_E200V2 + r_gate_scan_pos = yesno ? R_GATE_SCAN_POS_FLIPPED : R_GATE_SCAN_POS_NORMAL; +#endif + + if (display_on) + { +#ifndef SANSA_E200V2 + lcd_write_reg(R_GATE_SCAN_POS, r_gate_scan_pos); +#endif + lcd_write_reg(R_DRV_OUTPUT_CONTROL, r_drv_output_control); + } } +#endif -/* Set vertical window addresses */ -static void lcd_window_y(int ymin, int ymax) +#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) +bool lcd_active(void) { - lcd_write_reg(0x47, ymax); - lcd_write_reg(0x48, ymin); - lcd_write_reg(R_RAM_ADDR_SET, ymin); + return display_on; } +#endif + +/*** update functions ***/ static unsigned lcd_yuv_options = 0; void lcd_blit_yuv(unsigned char * const src[3], yuv_src[1] = src[1] + (z >> 2) + (src_x >> 1); yuv_src[2] = src[2] + (yuv_src[1] - src[1]); - lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_VIDEO); - - lcd_window_x(x, x + width - 1); +#ifndef SANSA_E200V2 + /* e200v2 and fuze don't have the same screen orientation */ + lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_BGR_VERT); +#endif if (lcd_yuv_options & LCD_YUV_DITHER) { do { - lcd_window_y(y, y + 1); + lcd_window_blit(x, y, x + width - 1, y + 1); lcd_write_cmd(R_WRITE_DATA_2_GRAM); void lcd_blit_yuv(unsigned char * const src[3], { do { - lcd_window_y(y, y + 1); + lcd_window_blit(x, y, x + width - 1, y + 1); lcd_write_cmd(R_WRITE_DATA_2_GRAM); void lcd_update(void) if (!display_on) return; - lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ); + lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_BGR_HORZ); - lcd_window_x(0, LCD_WIDTH - 1); - lcd_window_y(0, LCD_HEIGHT - 1); + lcd_window(0, 0, LCD_WIDTH - 1, LCD_HEIGHT - 1); lcd_write_cmd(R_WRITE_DATA_2_GRAM); void lcd_update_rect(int x, int y, int width, int height) if (y + height > LCD_HEIGHT) height = LCD_HEIGHT - y; /* clip bottom */ - lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ); + lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_BGR_HORZ); /* we need to make x and width even to enable 32bit transfers */ width = (width + (x & 1) + 1) & ~1; x &= ~1; - lcd_window_x(x, x + width - 1); - lcd_window_y(y, y + height -1); + lcd_window(x, y, x + width - 1, y + height - 1); lcd_write_cmd(R_WRITE_DATA_2_GRAM); diff --git a/firmware/target/arm/as3525/lcd-fuze.h b/firmware/target/arm/as3525/lcd-fuze.h index 50bec9b..6da3fdd 100644 -/* register defines */ -#define R_START_OSC 0x00 -#define R_DRV_OUTPUT_CONTROL 0x01 -#define R_DRV_WAVEFORM_CONTROL 0x02 -#define R_ENTRY_MODE 0x03 -#define R_COMPARE_REG1 0x04 -#define R_COMPARE_REG2 0x05 - -#define R_DISP_CONTROL1 0x07 -#define R_DISP_CONTROL2 0x08 -#define R_DISP_CONTROL3 0x09 - -#define R_FRAME_CYCLE_CONTROL 0x0b -#define R_EXT_DISP_IF_CONTROL 0x0c - -#define R_POWER_CONTROL1 0x10 -#define R_POWER_CONTROL2 0x11 -#define R_POWER_CONTROL3 0x12 -#define R_POWER_CONTROL4 0x13 - -#define R_RAM_ADDR_SET 0x21 -#define R_WRITE_DATA_2_GRAM 0x22 - -#define R_GAMMA_FINE_ADJ_POS1 0x30 -#define R_GAMMA_FINE_ADJ_POS2 0x31 -#define R_GAMMA_FINE_ADJ_POS3 0x32 -#define R_GAMMA_GRAD_ADJ_POS 0x33 - -#define R_GAMMA_FINE_ADJ_NEG1 0x34 -#define R_GAMMA_FINE_ADJ_NEG2 0x35 -#define R_GAMMA_FINE_ADJ_NEG3 0x36 -#define R_GAMMA_GRAD_ADJ_NEG 0x37 - -#define R_GAMMA_AMP_ADJ_RES_POS 0x38 -#define R_GAMMA_AMP_AVG_ADJ_RES_NEG 0x39 - -#define R_GATE_SCAN_POS 0x40 -#define R_VERT_SCROLL_CONTROL 0x41 -#define R_1ST_SCR_DRV_POS 0x42 -#define R_2ND_SCR_DRV_POS 0x43 -#define R_HORIZ_RAM_ADDR_POS 0x44 -#define R_VERT_RAM_ADDR_POS 0x45 - -#define R_ENTRY_MODE_HORZ 0x1030 -#define R_ENTRY_MODE_VIDEO 0x1038 - -/* Reverse Flag */ -#define R_DISP_CONTROL_NORMAL 0x0004 -#define R_DISP_CONTROL_REV 0x0000 - #define R_DRV_OUTPUT_CONTROL_NORMAL 0x115 #define R_DRV_OUTPUT_CONTROL_FLIPPED 0x215 +#define R_DISP_CONTROL_DEFAULT 0x13 + #define R_GATE_SCAN_POS_NORMAL 0 #define R_GATE_SCAN_POS_FLIPPED 18 void lcd_write_cmd(int16_t cmd); void lcd_write_reg(int reg, int value); void fuze_display_on(void); + +#define lcd_window_blit lcd_window diff --git a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c index 5a4c58f..fd44665 100644 * $Id$ * * Copyright (C) 2004 by Linus Nielsen Feltzing + * Copyright (C) 2008 by Dave Chapman * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License #include "cpu.h" #include "lcd.h" -#include "file.h" -#include "debug.h" #include "system.h" +#include "file.h" #include "clock-target.h" #include "dbop-as3525.h" +#include "hd66789r.h" -/* The controller is unknown, but some registers appear to be the same as the - HD66789R */ -static bool display_on = false; /* is the display turned on? */ - -/* register defines */ -#define R_START_OSC 0x00 -#define R_DRV_OUTPUT_CONTROL 0x01 -#define R_DRV_WAVEFORM_CONTROL 0x02 -#define R_ENTRY_MODE 0x03 -#define R_COMPARE_REG1 0x04 -#define R_COMPARE_REG2 0x05 - -#define R_DISP_CONTROL1 0x07 -#define R_DISP_CONTROL2 0x08 -#define R_DISP_CONTROL3 0x09 - -#define R_FRAME_CYCLE_CONTROL 0x0b -#define R_EXT_DISP_IF_CONTROL 0x0c - -#define R_POWER_CONTROL1 0x10 -#define R_POWER_CONTROL2 0x11 -#define R_POWER_CONTROL3 0x12 -#define R_POWER_CONTROL4 0x13 - -#define R_RAM_ADDR_SET 0x21 -#define R_WRITE_DATA_2_GRAM 0x22 - -#define R_GAMMA_FINE_ADJ_POS1 0x30 -#define R_GAMMA_FINE_ADJ_POS2 0x31 -#define R_GAMMA_FINE_ADJ_POS3 0x32 -#define R_GAMMA_GRAD_ADJ_POS 0x33 - -#define R_GAMMA_FINE_ADJ_NEG1 0x34 -#define R_GAMMA_FINE_ADJ_NEG2 0x35 -#define R_GAMMA_FINE_ADJ_NEG3 0x36 -#define R_GAMMA_GRAD_ADJ_NEG 0x37 - -#define R_GAMMA_AMP_ADJ_RES_POS 0x38 -#define R_GAMMA_AMP_AVG_ADJ_RES_NEG 0x39 - -#define R_GATE_SCAN_POS 0x40 -#define R_VERT_SCROLL_CONTROL 0x41 -#define R_1ST_SCR_DRV_POS 0x42 -#define R_2ND_SCR_DRV_POS 0x43 -#define R_HORIZ_RAM_ADDR_POS 0x44 -#define R_VERT_RAM_ADDR_POS 0x45 - -#define R_ENTRY_MODE_HORZ_NORMAL 0x7030 -#define R_ENTRY_MODE_VERT 0x7038 -#define R_ENTRY_MODE_SOLID_VERT 0x1038 - -/* Reverse Flag */ -#define R_DISP_CONTROL_NORMAL 0x0004 -#define R_DISP_CONTROL_REV 0x0000 -static unsigned short r_disp_control_rev = R_DISP_CONTROL_NORMAL; +#include "lcd-e200v2.h" static inline void lcd_delay(int x) { static void as3525_dbop_init(void) /* TODO: The OF calls some other functions here, but maybe not important */ } -static void lcd_write_cmd(short cmd) +void lcd_write_cmd(short cmd) { /* Write register */ DBOP_TIMPOL_23 = 0xa167006e; static void lcd_write_cmd(short cmd) } -static void lcd_write_reg(int reg, int value) +void lcd_write_reg(int reg, int value) { unsigned short data = value; static void lcd_write_reg(int reg, int value) /*** hardware configuration ***/ -void lcd_set_contrast(int val) -{ - (void)val; -} - -void lcd_set_invert_display(bool yesno) -{ - r_disp_control_rev = yesno ? R_DISP_CONTROL_REV : - R_DISP_CONTROL_NORMAL; - - if (display_on) - { - lcd_write_reg(R_DISP_CONTROL1, 0x0033 | r_disp_control_rev); - } - -} - -/* turn the display upside down */ -void lcd_set_flip(bool yesno) -{ - lcd_write_reg(R_DRV_OUTPUT_CONTROL, yesno ? 0x21b : 0x11b); -} - -static void lcd_window(int xmin, int ymin, int xmax, int ymax) +void lcd_window(int xmin, int ymin, int xmax, int ymax) { lcd_write_reg(R_HORIZ_RAM_ADDR_POS, (xmax << 8) | xmin); lcd_write_reg(R_VERT_RAM_ADDR_POS, (ymax << 8) | ymin); static void _display_on(void) /* Address counter updated in horizontal direction; left to right; * vertical increment horizontal increment. * data format for 8bit transfer or spi = 65k (5,6,5) */ - lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ_NORMAL); + lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_BGR_HORZ); /* Replace data on writing to GRAM */ lcd_write_reg(R_COMPARE_REG1, 0); lcd_write_reg(R_COMPARE_REG2, 0); /* GON = 0, DTE = 0, D1-0 = 00b */ - lcd_write_reg(R_DISP_CONTROL1, 0x0000 | r_disp_control_rev); + lcd_write_reg(R_DISP_CONTROL1, 0x0000 | R_DISP_CONTROL_NORMAL); /* Front porch lines: 2; Back porch lines: 2; */ lcd_write_reg(R_DISP_CONTROL2, 0x0203); static void _display_on(void) lcd_write_reg(R_GATE_SCAN_POS, 0); lcd_write_reg(R_VERT_SCROLL_CONTROL, 0); - lcd_window(0, 0, LCD_WIDTH-1, LCD_HEIGHT-1); + lcd_window(0, 0, LCD_WIDTH - 1, LCD_HEIGHT - 1); lcd_write_reg(R_1ST_SCR_DRV_POS, (LCD_HEIGHT-1) << 8); lcd_write_reg(R_2ND_SCR_DRV_POS, (LCD_HEIGHT-1) << 8); - lcd_write_reg(R_DISP_CONTROL1, 0x0033 | r_disp_control_rev); + lcd_write_reg(R_DISP_CONTROL1, 0x0033 | R_DISP_CONTROL_NORMAL); - display_on = true; /* must be done before calling lcd_update() */ - lcd_update(); } void lcd_init_device(void) void lcd_init_device(void) lcd_delay(1); _display_on(); -} - -#if defined(HAVE_LCD_ENABLE) -void lcd_enable(bool on) -{ - if (display_on == on) - return; - - if(on) - { - _display_on(); - send_event(LCD_EVENT_ACTIVATION, NULL); - } - else - { - display_on = false; - lcd_write_reg(R_POWER_CONTROL1, 0x0001); - } -} -#endif - -#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) -bool lcd_active(void) -{ - return display_on; -} -#endif - -/*** update functions ***/ - -static unsigned lcd_yuv_options = 0; -void lcd_yuv_set_options(unsigned options) -{ - lcd_yuv_options = options; + lcd_update(); } - #ifndef BOOTLOADER -static void lcd_window_blit(int xmin, int ymin, int xmax, int ymax) +void lcd_window_blit(int xmin, int ymin, int xmax, int ymax) { lcd_write_reg(R_HORIZ_RAM_ADDR_POS, - ((LCD_WIDTH-1 - xmin) << 8) | (LCD_WIDTH-1 - xmax)); - lcd_write_reg(R_VERT_RAM_ADDR_POS, (ymax << 8) | ymin); - lcd_write_reg(R_RAM_ADDR_SET, (ymin << 8) | (LCD_WIDTH-1 - xmin)); + ((LCD_WIDTH-1 - ymin) << 8) | (LCD_WIDTH-1 - ymax)); + lcd_write_reg(R_VERT_RAM_ADDR_POS, (xmax << 8) | xmin); + lcd_write_reg(R_RAM_ADDR_SET, (xmin << 8) | (LCD_WIDTH-1 - ymin)); } - -/* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. */ -extern void lcd_write_yuv420_lines(unsigned char const * const src[3], - int width, - int stride); -extern void lcd_write_yuv420_lines_odither(unsigned char const * const src[3], - int width, - int stride, - int x_screen, /* To align dither pattern */ - int y_screen); - -/* Performance function to blit a YUV bitmap directly to the LCD - * src_x, src_y, width and height should be even - * x, y, width and height have to be within LCD bounds - */ -void lcd_blit_yuv(unsigned char * const src[3], - int src_x, int src_y, int stride, - int x, int y, int width, int height) -{ - unsigned char const * yuv_src[3]; - off_t z; - - /* Sorry, but width and height must be >= 2 or else */ - width &= ~1; - height >>= 1; - - z = stride*src_y; - yuv_src[0] = src[0] + z + src_x; - yuv_src[1] = src[1] + (z >> 2) + (src_x >> 1); - yuv_src[2] = src[2] + (yuv_src[1] - src[1]); - - if (lcd_yuv_options & LCD_YUV_DITHER) - { - do - { - lcd_window_blit(y, x, y+1, x+width-1); - - lcd_write_cmd(R_WRITE_DATA_2_GRAM); - - lcd_write_yuv420_lines_odither(yuv_src, width, stride, x, y); - yuv_src[0] += stride << 1; /* Skip down two luma lines */ - yuv_src[1] += stride >> 1; /* Skip down one chroma line */ - yuv_src[2] += stride >> 1; - y += 2; - } - while (--height > 0); - } - else - { - do - { - lcd_window_blit(y, x, y+1, x+width-1); - - lcd_write_cmd(R_WRITE_DATA_2_GRAM); - - lcd_write_yuv420_lines(yuv_src, width, stride); - yuv_src[0] += stride << 1; /* Skip down two luma lines */ - yuv_src[1] += stride >> 1; /* Skip down one chroma line */ - yuv_src[2] += stride >> 1; - y += 2; - } - while (--height > 0); - } -} - #endif - - -/* Update the display. - This must be called after all other LCD functions that change the display. */ -void lcd_update(void) -{ - if (!display_on) - return; - - lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ_NORMAL); - - /* Set start position and window */ - lcd_window(0, 0, LCD_WIDTH-1, LCD_HEIGHT-1); - - lcd_write_cmd(R_WRITE_DATA_2_GRAM); - - dbop_write_data((fb_data*)lcd_framebuffer, LCD_WIDTH*LCD_HEIGHT); -} - -/* Update a fraction of the display. */ -void lcd_update_rect(int x, int y, int width, int height) -{ - const fb_data *ptr; - - if (!display_on) - return; - - /* nothing to draw? */ - if ((width <= 0) || (height <= 0) || (x >= LCD_WIDTH) || - (y >= LCD_HEIGHT) || (x + width <= 0) || (y + height <= 0)) - return; - - if (x < 0) - { /* clip left */ - width += x; - x = 0; - } - if (y < 0) - { /* clip top */ - height += y; - y = 0; - } - if (x + width > LCD_WIDTH) - width = LCD_WIDTH - x; /* clip right */ - if (y + height > LCD_HEIGHT) - height = LCD_HEIGHT - y; /* clip bottom */ - - lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ_NORMAL); - - /* we need to make x and width even to enable 32bit transfers */ - width = (width + (x & 1) + 1) & ~1; - x &= ~1; - - lcd_window(x, y, x+width-1, y+height-1); - lcd_write_cmd(R_WRITE_DATA_2_GRAM); - - ptr = &lcd_framebuffer[y][x]; - - do - { - dbop_write_data(ptr, width); - ptr += LCD_WIDTH; - } - while (--height > 0); -} diff --git a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.h b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.h new file mode 100644 index 0000000..3112d2a +#define R_DRV_OUTPUT_CONTROL_NORMAL 0x115 +#define R_DRV_OUTPUT_CONTROL_FLIPPED 0x215 + +#define R_DISP_CONTROL_DEFAULT 0x33 + +void lcd_write_cmd(int16_t cmd); +void lcd_write_reg(int reg, int value); +void lcd_window(int x, int y, int xmin, int ymin); +void lcd_window_blit(int x, int y, int xmin, int ymin); |
