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
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c
index 48f21bc..f22b5fc 100644
--- a/bootloader/sansa_as3525.c
+++ b/bootloader/sansa_as3525.c
@@ -27,7 +27,7 @@
 #include <inttypes.h>
 #include "config.h"
 #include "lcd.h"
-#include "backlight-target.h"
+#include "backlight.h"
 #include "button-target.h"
 #include "common.h"
 #include "storage.h"
@@ -48,14 +48,17 @@ void main(void)
     system_init();
     kernel_init();

+    _buttonlight_on();
+
+    lcd_init();
+    show_logo();
+
+    backlight_init();
+
 #ifdef SANSA_C200V2
     /* stop here */
     while(1);
 #endif
-    lcd_init();
-    show_logo();
-
-    _backlight_on();

     button_init_device();
     int btn = button_read_device();
diff --git a/firmware/export/as3525.h b/firmware/export/as3525.h
index 31bbeed..be97916 100644
--- a/firmware/export/as3525.h
+++ b/firmware/export/as3525.h
@@ -114,7 +114,7 @@
 #define DBOP_TIMPOL_23    (*(volatile unsigned long *)(DBOP_BASE + 0x04))
 #define DBOP_CTRL         (*(volatile unsigned long *)(DBOP_BASE + 0x08))
 #define DBOP_STAT         (*(volatile unsigned long *)(DBOP_BASE + 0x0C))
-#define DBOP_DOUT         (*(volatile unsigned short*)(DBOP_BASE + 0x10))
+#define DBOP_DOUT         (*(volatile unsigned long *)(DBOP_BASE + 0x10))
 #define DBOP_DIN          (*(volatile unsigned short*)(DBOP_BASE + 0x14))


diff --git a/firmware/export/config-c200v2.h b/firmware/export/config-c200v2.h
index 775a39f..d06ba88 100644
--- a/firmware/export/config-c200v2.h
+++ b/firmware/export/config-c200v2.h
@@ -55,30 +55,29 @@
 #define LCD_DEPTH  16   /* 65536 colours */
 #define LCD_PIXELFORMAT RGB565 /* rgb565 */

-#ifndef BOOTLOADER
 /* define this if you have LCD enable function */
+
 #define HAVE_LCD_ENABLE

 /* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE
    should be defined as well. */
 /* TODO: #define HAVE_LCD_SLEEP */
 /* TODO: #define HAVE_LCD_SLEEP_SETTING <= optional */
-#endif
+
 /* define this if you can flip your LCD */
 #define HAVE_LCD_FLIP

 /* define this if you can invert the colours on your LCD */
 /* TODO: #define HAVE_LCD_INVERT */

-#if 0
 /* Define this if your LCD can set contrast */
 #define HAVE_LCD_CONTRAST

 #define MIN_CONTRAST_SETTING        0
 #define MAX_CONTRAST_SETTING        255
 #define DEFAULT_CONTRAST_SETTING    85
-#endif
-/* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */
+
+ #define IRAM_LCDFRAMEBUFFER IDATA_ATTR /* put the lcd frame buffer in IRAM */

 #define CONFIG_KEYPAD SANSA_C200_PAD

diff --git a/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c
index f036792..858e9ae 100644
--- a/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c
+++ b/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c
@@ -26,8 +26,12 @@
 #include "ascodec-target.h"
 #include "as3514.h"

-/* TODO: This file is copy & pasted from backlight-e200v2-fuze.c, as I think
- * it'll be the same for c200v2; prove it */
+bool _backlight_init(void)
+{
+    GPIOA_DIR |= 1<<5;
+    return true;
+}
+
 void _backlight_set_brightness(int brightness)
 {
     if (brightness > 0)
@@ -41,12 +45,12 @@ void _backlight_on(void)
 #ifdef HAVE_LCD_ENABLE
     lcd_enable(true); /* power on lcd + visible display */
 #endif
-    ascodec_write(AS3514_DCDC15, backlight_brightness);
+    GPIOA_PIN(5) = 1<<5;
 }

 void _backlight_off(void)
 {
-    ascodec_write(AS3514_DCDC15, 0x0);
+    GPIOA_PIN(5) = 0;
 #ifdef HAVE_LCD_ENABLE
     lcd_enable(false); /* power off visible display */
 #endif
diff --git a/firmware/target/arm/as3525/sansa-c200v2/backlight-target.h b/firmware/target/arm/as3525/sansa-c200v2/backlight-target.h
index e8a60fa..06076dd 100644
--- a/firmware/target/arm/as3525/sansa-c200v2/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-c200v2/backlight-target.h
@@ -21,7 +21,9 @@
 #ifndef BACKLIGHT_TARGET_H
 #define BACKLIGHT_TARGET_H

-#define _backlight_init() true
+#include <stdbool.h>
+
+bool _backlight_init(void);
 void _backlight_on(void);
 void _backlight_off(void);
 void _backlight_set_brightness(int brightness);
diff --git a/firmware/target/arm/as3525/sansa-c200v2/lcd-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/lcd-c200v2.c
index e16b082..b9423b7 100644
--- a/firmware/target/arm/as3525/sansa-c200v2/lcd-c200v2.c
+++ b/firmware/target/arm/as3525/sansa-c200v2/lcd-c200v2.c
@@ -5,9 +5,9 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: lcd-e200v2.c 19453 2008-12-16 02:50:39Z saratoga $
+ * $Id$
  *
- * Copyright (C) 2004 by Linus Nielsen Feltzing
+ * Copyright (C) 2007 by Mark Arigo
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,412 +18,364 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-
-/* FIXME: Copied from e200v2 lcd driver, unlikely to work, but maybe */
-
 #include "config.h"
-
 #include "cpu.h"
 #include "lcd.h"
 #include "kernel.h"
-#include "thread.h"
-#include <string.h>
-#include <stdlib.h>
-#include "file.h"
-#include "debug.h"
 #include "system.h"
-#include "font.h"
-#include "bidi.h"
-#include "clock-target.h"
-
-static bool display_on = false; /* is the display turned on? */
-static bool display_flipped = false;
-static int y_offset = 0; /* needed for flip */
-
-/* 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 0x7030
-#define R_ENTRY_MODE_VERT 0x7038
-#define R_ENTRY_MODE_SOLID_VERT  0x1038
-
-/* TODO: Implement this function */
-static void lcd_delay(int x)
+
+/* Display status */
+static unsigned lcd_yuv_options = 0;
+static bool is_lcd_enabled = true;
+
+/* LCD command set for Samsung S6B33B2 */
+
+#define R_NOP                  0x00
+#define R_OSCILLATION_MODE     0x02
+#define R_DRIVER_OUTPUT_MODE   0x10
+#define R_DCDC_SET             0x20
+#define R_BIAS_SET             0x22
+#define R_DCDC_CLOCK_DIV       0x24
+#define R_DCDC_AMP_ONOFF       0x26
+#define R_TEMP_COMPENSATION    0x28
+#define R_CONTRAST_CONTROL1    0x2a
+#define R_CONTRAST_CONTROL2    0x2b
+#define R_STANDBY_OFF          0x2c
+#define R_STANDBY_ON           0x2d
+#define R_DDRAM_BURST_OFF      0x2e
+#define R_DDRAM_BURST_ON       0x2f
+#define R_ADDRESSING_MODE      0x30
+#define R_ROW_VECTOR_MODE      0x32
+#define R_N_LINE_INVERSION     0x34
+#define R_FRAME_FREQ_CONTROL   0x36
+#define R_RED_PALETTE          0x38
+#define R_GREEN_PALETTE        0x3a
+#define R_BLUE_PALETTE         0x3c
+#define R_ENTRY_MODE           0x40
+#define R_X_ADDR_AREA          0x42
+#define R_Y_ADDR_AREA          0x43
+#define R_RAM_SKIP_AREA        0x45
+#define R_DISPLAY_OFF          0x50
+#define R_DISPLAY_ON           0x51
+#define R_SPEC_DISPLAY_PATTERN 0x53
+#define R_PARTIAL_DISPLAY_MODE 0x55
+#define R_PARTIAL_START_LINE   0x56
+#define R_PARTIAL_END_LINE     0x57
+#define R_AREA_SCROLL_MODE     0x59
+#define R_SCROLL_START_LINE    0x5a
+#define R_DATA_FORMAT_SELECT   0x60
+
+
+static inline void lcd_delay(int delay)
 {
-    /* This is just arbitrary - the OF does something more complex */
-    x *= 1024;
-    while (x--);
+    //sleep delay milliseconds
+    delay <<= 14;
+    while(delay--) ;
 }

-/* DBOP initialisation, do what OF does */
-static void ams3525_dbop_init(void)
+/* send LCD data */
+static void lcd_send_data(unsigned short data)
 {
-    CGU_DBOP = (1<<3) | AS3525_DBOP_DIV;
-
-    DBOP_TIMPOL_01 = 0xe167e167;
-    DBOP_TIMPOL_23 = 0xe167006e;
-    DBOP_CTRL = 0x41008;
-
-    GPIOB_AFSEL = 0xfc;
-    GPIOC_AFSEL = 0xff;
+    DBOP_DOUT = data | (data << 16);

-    DBOP_TIMPOL_23 = 0x6000e;
-    DBOP_CTRL = 0x51008;
-    DBOP_TIMPOL_01 = 0x6e167;
-    DBOP_TIMPOL_23 = 0xa167e06f;
-
-    /* TODO: The OF calls some other functions here, but maybe not important */
+    while ((DBOP_STAT & (1<<10)) == 0);
 }

-
-static void lcd_write_cmd(int cmd)
+/* send LCD command */
+static void lcd_send_command(unsigned short cmd)
 {
-    /* Write register */
-    DBOP_CTRL &= ~(1<<14);
-
     DBOP_TIMPOL_23 = 0xa167006e;
-
     DBOP_DOUT = cmd;

-    /* Wait for fifo to empty */
     while ((DBOP_STAT & (1<<10)) == 0);

     DBOP_TIMPOL_23 = 0xa167e06f;
 }

-void lcd_write_data(const fb_data* p_bytes, int count)
-{
-    while (count--)
-    {
-        DBOP_DOUT = *p_bytes++;
-
-        /* Wait for fifo to empty */
-        while ((DBOP_STAT & (1<<10)) == 0);
-    }
-}
-
-static void lcd_write_reg(int reg, int value)
-{
-    unsigned short data = value;
-
-    lcd_write_cmd(reg);
-    lcd_write_data(&data, 1);
-}
-
-/*** hardware configuration ***/
-
-void lcd_set_contrast(int val)
-{
-    (void)val;
-}
-
-void lcd_set_invert_display(bool yesno)
+/* LCD init */
+void lcd_init_device(void)
 {
-    (void)yesno;
-}
+    CGU_DBOP = (1<<3) | AS3525_DBOP_DIV;

-static void flip_lcd(bool yesno)
-{
-    (void)yesno;
-}
+    DBOP_TIMPOL_01 = 0xe167e167;
+    DBOP_TIMPOL_23 = 0xe167006e;
+    DBOP_CTRL = 0x40008;

+    GPIOB_AFSEL = 0xc;
+    GPIOC_AFSEL = 0xff;

-/* turn the display upside down (call lcd_update() afterwards) */
-void lcd_set_flip(bool yesno)
-{
-    display_flipped = yesno;
-    y_offset = yesno ? 4 : 0;   /* FIXME: Is a y_offset needed? */
+    DBOP_TIMPOL_23 = 0x6006e;
+    DBOP_CTRL = 0x50008;
+    DBOP_TIMPOL_01 = 0x6e167;
+    DBOP_TIMPOL_23 = 0xa167e06f;

-    if (display_on)
-        flip_lcd(yesno);
-}
+    GPIOB_DIR |= 1<<6;
+    GPIOB_PIN(6) = 0;

-static void _display_on(void)
-{
-    /* Initialisation the display the same way as the original firmware */
+    GPIOA_DIR |= 1<<4;
+    GPIOA_PIN(4) = 0;

-    lcd_write_reg(R_START_OSC, 0x0001); /* Start Oscilation */
+    GPIOA_DIR |= 1<<1;
+    GPIOA_PIN(1) = 1<<1;

-    lcd_write_reg(R_DRV_OUTPUT_CONTROL, 0x011b); /* 220 lines, GS=0, SS=1 */
+    GPIOB_DIR |= 1<<5;
+    GPIOB_PIN(5) = 0;

-    /* B/C = 1: n-line inversion form
-     * EOR = 1: polarity inversion occurs by applying an EOR to odd/even
-     *          frame select signal and an n-line inversion signal.
-     * FLD = 01b: 1 field interlaced scan, external display iface */
-    lcd_write_reg(R_DRV_WAVEFORM_CONTROL, 0x0700);
+    CCU_IO &= ~0xc; // xpd = gpio

-    /* 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, 0x0030);
+    lcd_delay(2);

-    /* Replace data on writing to GRAM */
-    lcd_write_reg(R_COMPARE_REG1, 0);
-    lcd_write_reg(R_COMPARE_REG2, 0);
+    lcd_send_command(R_NOP);
+    lcd_send_command(R_NOP);

-    lcd_write_reg(R_DISP_CONTROL1, 0x0000);  /* GON = 0, DTE = 0, D1-0 = 00b */
+    lcd_send_command(R_STANDBY_OFF);
+    lcd_delay(20);

-    /* Front porch lines: 2; Back porch lines: 2; */
-    lcd_write_reg(R_DISP_CONTROL2, 0x0203);
+    lcd_send_command(R_OSCILLATION_MODE);
+    lcd_send_command(0x01);
+    lcd_delay(20);

-    /* Scan cycle = 0 frames */
-    lcd_write_reg(R_DISP_CONTROL3, 0x0000);
+    lcd_send_command(R_DCDC_AMP_ONOFF);
+    lcd_send_command(0x01);
+    lcd_delay(20);

-    /* 16 clocks */
-    lcd_write_reg(R_FRAME_CYCLE_CONTROL, 0x0000);
+    lcd_send_command(R_DCDC_AMP_ONOFF);
+    lcd_send_command(0x09);
+    lcd_delay(20);

-    /* 18-bit RGB interface (one transfer/pixel)
-     * internal clock operation;
-     * System interface/VSYNC interface */
-    lcd_write_reg(R_EXT_DISP_IF_CONTROL, 0x0000);
+    lcd_send_command(R_DCDC_AMP_ONOFF);
+    lcd_send_command(0x0b);
+    lcd_delay(20);

+    lcd_send_command(R_DCDC_AMP_ONOFF);
+    lcd_send_command(0x0f);
+    lcd_delay(20);

-    /* zero everything*/
-    lcd_write_reg(R_POWER_CONTROL1, 0x0000); /* STB = 0, SLP = 0 */
+    lcd_send_command(R_DRIVER_OUTPUT_MODE);
+    lcd_send_command(0x0C);

-    lcd_delay(10);
+    lcd_send_command(R_DCDC_SET);
+    lcd_send_command(0x03);

-    /* initialise power supply */
+#if 0
+    lcd_send_command(R_DCDC_CLOCK_DIV);
+    lcd_send_command(0x03);

-    /* DC12-10 = 000b: Step-up1 = clock/8,
-     * DC02-00 = 000b: Step-up2 = clock/16,
-     * VC2-0   = 010b: VciOUT = 0.87 * VciLVL */
-    lcd_write_reg(R_POWER_CONTROL2, 0x0002); 
+    lcd_send_command(R_TEMP_COMPENSATION);
+    lcd_send_command(0x01);
+#endif
+    lcd_send_command(R_CONTRAST_CONTROL1);
+    lcd_send_command(0x51);
+#if 0
+    lcd_send_command(R_ADDRESSING_MODE);
+    lcd_send_command(0x10);

-    /* VRH3-0 = 1000b: Vreg1OUT = REGP * 1.90 */
-    lcd_write_reg(R_POWER_CONTROL3, 0x0008);
+    lcd_send_command(R_ROW_VECTOR_MODE);
+    lcd_send_command(0x0e);
+#endif
+    lcd_send_command(R_N_LINE_INVERSION);
+    lcd_send_command(0xdf);

-    lcd_delay(40);
-    
-    lcd_write_reg(R_POWER_CONTROL4, 0x0000); /* VCOMG = 0 */
+#if 0
+    lcd_send_command(R_FRAME_FREQ_CONTROL);
+    lcd_send_command(0);
+#endif

-    /* This register is unknown */
-    lcd_write_reg(0x56, 0x80f);
+    lcd_send_command(R_ENTRY_MODE);
+    lcd_send_command(0x82);

+    DBOP_CTRL |= (1<<13);   //2 serial words out
+    DBOP_CTRL &= ~(1<<12);  //output data width = 8 bit

-    lcd_write_reg(R_POWER_CONTROL1, 0x4140);
+    lcd_send_command(R_Y_ADDR_AREA | (0x1a << 8));  /* vertical dimensions */
+    lcd_send_command(LCD_HEIGHT - 1 + 0x1a); /* y2 + 0x1a */

+    lcd_send_command(R_X_ADDR_AREA);         /* horizontal dimensions */
+    lcd_send_command(LCD_WIDTH - 1);         /* x2 */
     lcd_delay(10);

-    lcd_write_reg(R_POWER_CONTROL2, 0x0000); 
-    lcd_write_reg(R_POWER_CONTROL3, 0x0013); 
-
-    lcd_delay(20);
-
-    lcd_write_reg(R_POWER_CONTROL4, 0x6d0e);
-
-    lcd_delay(20);
-
-    lcd_write_reg(R_POWER_CONTROL4, 0x6d0e);
-
-    lcd_write_reg(R_GAMMA_FINE_ADJ_POS1, 0x0002);
-    lcd_write_reg(R_GAMMA_FINE_ADJ_POS2, 0x0707);
-    lcd_write_reg(R_GAMMA_FINE_ADJ_POS3, 0x0182);
-    lcd_write_reg(R_GAMMA_GRAD_ADJ_POS, 0x0203);
-    lcd_write_reg(R_GAMMA_FINE_ADJ_NEG1, 0x0706);
-    lcd_write_reg(R_GAMMA_FINE_ADJ_NEG2, 0x0006);
-    lcd_write_reg(R_GAMMA_FINE_ADJ_NEG3, 0x0706);
-    lcd_write_reg(R_GAMMA_GRAD_ADJ_NEG, 0x0000);
-    lcd_write_reg(R_GAMMA_AMP_ADJ_RES_POS, 0x030f);
-    lcd_write_reg(R_GAMMA_AMP_AVG_ADJ_RES_NEG, 0x0f08);
-
-
-    lcd_write_reg(R_RAM_ADDR_SET, 0);
-    lcd_write_reg(R_GATE_SCAN_POS, 0);
-    lcd_write_reg(R_VERT_SCROLL_CONTROL, 0);
-    
-    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_HORIZ_RAM_ADDR_POS, (LCD_WIDTH-1) << 8);
-    lcd_write_reg(R_VERT_RAM_ADDR_POS, (LCD_HEIGHT-1) << 8);
-
-
-    lcd_write_reg(R_DISP_CONTROL1, 0x0037);
-
-    display_on=true;  /* must be done before calling lcd_update() */
-    lcd_update();
+    lcd_send_command(R_DISPLAY_ON);
 }

-/* LCD init */
-void lcd_init_device(void)
+/*** hardware configuration ***/
+int lcd_default_contrast(void)
 {
-    ams3525_dbop_init();
-
-    /* Init GPIOs the same as the OF */
-
-    GPIOA_DIR |= (1<<5);
-    GPIOA_PIN(5) = 0;
-
-    GPIOA_PIN(3) = (1<<3);
-
-    GPIOA_DIR |= (3<<3);
-
-    GPIOA_PIN(3) = (1<<3);
-
-    GPIOA_PIN(4) = 0;  /*c80b0040 := 0;*/
-
-    GPIOA_DIR |= (1<<7);
-    GPIOA_PIN(7) = 0;
-
-    lcd_delay(1);
-
-    GPIOA_PIN(5) = (1<<5);
+    return DEFAULT_CONTRAST_SETTING;
+}

-    lcd_delay(1);
+void lcd_set_contrast(int val)
+{
+    lcd_send_command(R_CONTRAST_CONTROL1);
+    lcd_send_command(val);
+}

-    _display_on();
+void lcd_set_invert_display(bool yesno)
+{
+    /* TODO: Implement lcd_set_invert_display() */
+    (void)yesno;
 }

-void lcd_enable(bool on)
+#if defined(HAVE_LCD_ENABLE)
+void lcd_enable(bool yesno)
 {
-    if(display_on!=on)
+    if (yesno == is_lcd_enabled)
+        return;
+
+    if ((is_lcd_enabled = yesno))
     {
-        if(on)
-        {
-            _display_on();
-            lcd_activation_call_hook();
-        }
-        else
-        {
-            /* TODO: Implement off sequence */
-            display_on=false;
-        }
+        lcd_send_command(R_STANDBY_OFF);
+        lcd_send_command(R_DISPLAY_ON);
+        lcd_activation_call_hook();
+    }
+    else
+    {
+        lcd_send_command(R_STANDBY_ON);
     }
 }
+#endif

+#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
 bool lcd_active(void)
 {
-    return display_on;
+    return is_lcd_enabled;
 }
+#endif
+

-void lcd_sleep(void)
+/* turn the display upside down (call lcd_update() afterwards) */
+void lcd_set_flip(bool yesno)
 {
-    /* TODO */
+    lcd_send_command(R_DRIVER_OUTPUT_MODE);
+    lcd_send_command(yesno ? 0x02 : 0x07);
 }

 /*** update functions ***/

-/* 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_yuv_set_options(unsigned options)
+{
+    lcd_yuv_options = options;
+}
+
+/* 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 */
 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)
 {
-    (void)src;
-    (void)src_x;
-    (void)src_y;
-    (void)stride;
-    (void)x;
-    (void)y;
-    (void)width;
-    (void)height;
-}
+    unsigned char const * yuv_src[3];
+    off_t z;

-/* Update the display.
-   This must be called after all other LCD functions that change the display. */
-void lcd_update(void)
-{
-    if (!display_on)
-        return;
+    /* Sorry, but width and height must be >= 2 or else */
+    width &= ~1;
+    height >>= 1;
+    
+    y += 0x1a;

-    lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ);
+    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]);

-    /* Set start position and window */
-    lcd_write_reg(R_HORIZ_RAM_ADDR_POS, (LCD_WIDTH-1) << 8);
-    lcd_write_reg(R_VERT_RAM_ADDR_POS, 
-                  ((y_offset + LCD_HEIGHT-1) << 8) | y_offset);
-    lcd_write_reg(R_RAM_ADDR_SET, (y_offset) << 8);
+    lcd_send_command(R_ENTRY_MODE);
+    lcd_send_command(0x80);

-    lcd_write_cmd(R_WRITE_DATA_2_GRAM);
+    lcd_send_command(R_X_ADDR_AREA | (x<<8));
+    lcd_send_command(x + width - 1);

-    lcd_write_data((unsigned short *)lcd_framebuffer, LCD_WIDTH*LCD_HEIGHT);
-    
-} /* lcd_update */
+    if (lcd_yuv_options & LCD_YUV_DITHER)
+    {
+        do
+        {
+            lcd_send_command(R_Y_ADDR_AREA | (y<<8));
+            lcd_send_command(y + 1);
+
+            /* NOP needed because on some c200s, the previous lcd_send_command
+               is interpreted as a separate command instead of part of
+               R_Y_ADDR_AREA. */
+            lcd_send_command(R_NOP);
+
+            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_send_command(R_Y_ADDR_AREA | (y<<8));
+            lcd_send_command(y + 1);

+            lcd_send_command(R_NOP);
+
+            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);
+    }
+}
+
+/* Update the display.
+   This must be called after all other LCD functions that change the display. */
+void lcd_update(void)
+{
+    lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT);
+}

 /* Update a fraction of the display. */
 void lcd_update_rect(int x, int y, int width, int height)
 {
-    int ymax;
-    const unsigned short *ptr;
+    const fb_data *addr;
+    
+    if (x + width >= LCD_WIDTH)
+        width = LCD_WIDTH - x;
+    if (y + height >= LCD_HEIGHT)
+        height = LCD_HEIGHT - y;
+        
+    if ((width <= 0) || (height <= 0))
+        return; /* Nothing left to do. */
+
+    addr = &lcd_framebuffer[y][x];
+
+    if (width <= 1) {                    
+        lcd_send_command(R_ENTRY_MODE);  /* The X end address must be larger */
+        lcd_send_command(0x80);          /* that the X start address, so we */
+        lcd_send_command(R_X_ADDR_AREA | (x<<8)); /* switch to vertical mode */
+                                         /* for single column updates and set */
+        lcd_send_command(x + 1);         /* the window width to 2 */
+    } else {
+        lcd_send_command(R_ENTRY_MODE);
+        lcd_send_command(0x82);
+        lcd_send_command(R_X_ADDR_AREA | (x<<8));
+        lcd_send_command(x + width - 1);
+    }

-    if (!display_on)
-        return;
+    lcd_send_command(R_Y_ADDR_AREA | ((y + 0x1a) << 8));
+    lcd_send_command(y + height - 1 + 0x1a);

-    if (x + width > LCD_WIDTH)
-        width = LCD_WIDTH - x; /* Clip right */
-    if (x < 0)
-        width += x, x = 0; /* Clip left */
-    if (width <= 0)
-        return; /* nothing left to do */
-
-    ymax = y + height;
-    if (ymax > LCD_HEIGHT)
-        ymax = LCD_HEIGHT; /* Clip bottom */
-    if (y < 0)
-        y = 0; /* Clip top */
-    if (y >= ymax)
-        return; /* nothing left to do */
-
-    lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ);
-    /* Set start position and window */
-    lcd_write_reg(R_HORIZ_RAM_ADDR_POS, 
-                  ((x + width-1) << 8) | x);
-    lcd_write_reg(R_VERT_RAM_ADDR_POS, 
-                  ((y_offset + y + height - 1) << 8) | (y_offset + y));
-    lcd_write_reg(R_RAM_ADDR_SET, ((y + y_offset) << 8) | x);
-
-    lcd_write_cmd(R_WRITE_DATA_2_GRAM);
-
-    ptr = (unsigned short *)&lcd_framebuffer[y][x];
-
-    do
-    {
-        lcd_write_data(ptr, width);
-        ptr += LCD_WIDTH;
-    }
-    while (++y < ymax);
-} /* lcd_update_rect */
+    /* NOP needed because on some c200s, the previous lcd_send_command is
+       interpreted as a separate command instead of part of R_Y_ADDR_AREA. */
+    lcd_send_command(R_NOP);
+
+    do {
+        int w = width;
+        do {
+            lcd_send_data(*addr++);
+        } while (--w > 0);
+        addr += LCD_WIDTH - width;
+    } while (--height > 0);
+}