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
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
commit 3bb6579ff25b32447e557d9fb9e0a158034b6807
Author: Rafaël Carré <[email protected]>
Date:   Wed Jun 17 20:24:00 2009 +0200

    Sansa c200v2 : lcd & backlight support, using the c200v1 lcd driver
    
    The LCD driver is unified and lcd_send_command now takes 2 arguments : the command and its argument.
        If there is no argument, it's set to 0 and a NOP command is issued
        If there is more than one argument (set X/Y address), the 2nd argument is sent as a 2nd command, and a NOP command is issued after it.
        Benefit : c200v2 transfers the command and the argument in one 16 bits transfer
        Performance should not be affected since commands without argument are only used in lcd_init() and lcd_enable()
    
    lcd_send_data() now transfers whole lines (or columns) instead of single pixels
    yuv is disabled for c200v2 for now
    
    Some buttons can be read, including left button (bit 6 of DBOP_DIN), but for some reason navigation is not possible : to be investigated
    
    Sometimes there is no LCD output in the bootloader

diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c
index 48f21bc..7e6ac2d 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,12 @@ void main(void)
     system_init();
     kernel_init();
 
-#ifdef SANSA_C200V2
-    /* stop here */
-    while(1);
-#endif
+    enable_irq();
+
     lcd_init();
     show_logo();
 
-    _backlight_on();
+    backlight_init();
 
     button_init_device();
     int btn = button_read_device();
@@ -79,8 +77,6 @@ void main(void)
         verbose = true;
     }
 
-    enable_irq();
-
     ret = storage_init();
     if(ret < 0)
         error(EATA,ret);
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 48e4c77..d5268ca 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -535,7 +535,7 @@ target/arm/powermgmt-ascodec.c
 target/arm/usb-fw-pp502x.c
 target/arm/sandisk/backlight-c200_e200.c
 target/arm/sandisk/power-c200_e200.c
-target/arm/sandisk/sansa-c200/lcd-c200.c
+target/arm/lcd-c200.c
 target/arm/sandisk/sansa-c200/lcd-as-c200.S
 target/arm/sandisk/sansa-c200/button-c200.c
 target/arm/sandisk/sansa-c200/powermgmt-c200.c
@@ -1137,7 +1137,7 @@ target/arm/as3525/sansa-e200v2/powermgmt-e200v2.c
 
 #ifdef SANSA_C200V2
 #ifndef SIMULATOR
-target/arm/as3525/sansa-c200v2/lcd-c200v2.c
+target/arm/lcd-c200.c
 target/arm/as3525/sansa-c200v2/button-c200v2.c
 target/arm/as3525/sansa-c200v2/backlight-c200v2.c
 #ifndef BOOTLOADER
diff --git a/firmware/export/config-c200v2.h b/firmware/export/config-c200v2.h
index 775a39f..03f6ac0 100644
--- a/firmware/export/config-c200v2.h
+++ b/firmware/export/config-c200v2.h
@@ -1,21 +1,25 @@
 /*
- * This config file is for the Sandisk Sansa e200
+ * This config file is for the Sandisk Sansa c200v2
  */
 #define TARGET_TREE /* this target is using the target tree system */
 
 /* For Rolo and boot loader */
 #define MODEL_NUMBER 44
 #define MODEL_NAME   "Sandisk Sansa c200v2 series"
+#define FIRMWARE_OFFSET_FILE_DATA 8
+#define FIRMWARE_OFFSET_FILE_CRC 0
+
+#if 0
 
 #define HW_SAMPR_CAPS       (SAMPR_CAP_44)
 
-#if 0
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
 
 #define REC_SAMPR_CAPS      (SAMPR_CAP_22)
 #define REC_FREQ_DEFAULT    REC_FREQ_22 /* Default is not 44.1kHz */
 #define REC_SAMPR_DEFAULT   SAMPR_22
+
 #endif
 
 /* Define bitmask of input sources - recordable bitmask can be defined
@@ -55,7 +59,6 @@
 #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
 
@@ -63,22 +66,21 @@
    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
 
@@ -91,7 +93,7 @@
 /* There is no hardware tone control */
 #define HAVE_SW_TONE_CONTROLS
 
-/* The PP5024 has a built-in AustriaMicrosystems AS3514 */
+/* The AS3525 has a built-in AS3514 (or a newer version) */
 #define HAVE_AS3514
 
 /* define this if you have a real-time clock */
@@ -114,7 +116,7 @@
 #define AB_REPEAT_ENABLE 1
 
 /* FM Tuner - suspected to be the SI4702 */
-#define CONFIG_TUNER SI4700
+//#define CONFIG_TUNER SI4700
 /* #define HAVE_TUNER_PWR_CTRL */
 
 /* Define this for LCD backlight available */
@@ -159,30 +161,22 @@
 #define ROM_START 0x00000000
 
 /* Define this to the CPU frequency */
-#define CPU_FREQ      75000000
+#define CPU_FREQ      250000000
 
 /* Type of LCD TODO: hopefully the same as the x5 but check this*/
 #define CONFIG_LCD LCD_C200
 
-/* Offset ( in the firmware file's header ) to the file CRC and data. These are
-   only used when loading the old format rockbox.e200 file */
-#define FIRMWARE_OFFSET_FILE_CRC    0x0
-#define FIRMWARE_OFFSET_FILE_DATA   0x8
-
 #define USB_HANDLED_BY_OF
 
 #ifndef BOOTLOADER
-#define HAVE_MULTIVOLUME
-#define HAVE_HOTSWAP
+//#define HAVE_MULTIVOLUME
+//#define HAVE_HOTSWAP
 #endif
 
-/* USB On-the-go */
-#define CONFIG_USBOTG USBOTG_ARC
-
 /* enable these for the experimental usb stack */
 //#define HAVE_USBSTACK
 //#define USB_VENDOR_ID 0x0781
-//#define USB_PRODUCT_ID 0x7450
+//#define USB_PRODUCT_ID 0x7452
 /* Virtual LED (icon) */
 #define CONFIG_LED LED_VIRTUAL
 
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/button-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c
index 86a6eb0..d3504c9 100644
--- a/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c
+++ b/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c
@@ -19,47 +19,70 @@
  *
  ****************************************************************************/
 
-/* Taken from button-h10.c by Barry Wardell and reverse engineering by MrH. */
-
 #include "system.h"
+#include "button-target.h"
 #include "button.h"
 #include "backlight.h"
 #include "powermgmt.h"
 
 
-#ifndef BOOTLOADER
-/* Buttons */
+unsigned short _dbop_din    = 0;
+
+/* in the lcd driver */
+extern bool lcd_button_support(void);
+
 static bool hold_button     = false;
+#ifndef BOOTLOADER
 static bool hold_button_old = false;
-#define _button_hold() hold_button
-#else
-#define _button_hold() false  /* FIXME */
-#endif /* BOOTLOADER */
-static int  int_btn         = BUTTON_NONE;
+#endif
 
 void button_init_device(void)
 {
+    GPIOA_DIR &= ~(1<<3);
 }
 
 bool button_hold(void)
 {
-    return _button_hold();
+    return hold_button;
+}
+
+static void button_read_dbop(void)
+{
+    /* Set up dbop for input */
+    DBOP_CTRL |= (1<<19);                /* Tri-state DBOP on read cycle */
+    DBOP_CTRL &= ~(1<<16);               /* disable output (1:write enabled) */
+    DBOP_TIMPOL_01 = 0xe167e167;         /* Set Timing & Polarity regs 0 & 1 */
+    DBOP_TIMPOL_23 = 0xe167006e;         /* Set Timing & Polarity regs 2 & 3 */
+
+    int i = 50;
+    while(i--) asm volatile ("nop\n");
+
+    DBOP_CTRL |= (1<<15);                /* start read */
+    while (!(DBOP_STAT & (1<<16)));      /* wait for valid data */
+
+    _dbop_din = DBOP_DIN;                /* Read dbop data*/
+
+    /* Reset dbop for output */
+    DBOP_TIMPOL_01 = 0x6e167;            /* Set Timing & Polarity regs 0 & 1 */
+    DBOP_TIMPOL_23 = 0xa167e06f;         /* Set Timing & Polarity regs 2 & 3 */
+    DBOP_CTRL |= (1<<16);                /* Enable output (0:write disable)  */
+    DBOP_CTRL &= ~(1<<19);               /* Tri-state when no active write */
 }
 
-/* device buttons */
-void button_int(void)
+/*
+ * Get button pressed from hardware
+ */
+int button_read_device(void)
 {
-    int delay = 0x50;
+    int delay;
     int dir_save_c = 0;
     int afsel_save_c = 0;
-
-    int_btn = BUTTON_NONE;
+    int btn = BUTTON_NONE;
 
     /* Save the current direction and afsel */
     dir_save_c = GPIOC_DIR;
     afsel_save_c = GPIOC_AFSEL;
 
-    GPIOA_DIR &= ~(1<<3);
     GPIOC_AFSEL &= ~(1<<6|1<<5|1<<4|1<<3);
     GPIOC_DIR |= (1<<6|1<<5|1<<4|1<<3);
 
@@ -72,32 +95,32 @@ void button_int(void)
     GPIOC_PIN(3) = (1<<3);
     GPIOC_DIR &= ~(1<<6|1<<5|1<<4|1<<3);
 
-    while(delay--);
+    delay = 100;
+    while(delay--)
+        asm volatile("nop\n");
     
     /* direct GPIO connections */
     if (GPIOA_PIN(3))
-        int_btn |= BUTTON_POWER;
+        btn |= BUTTON_POWER;
     if (!GPIOC_PIN(6))
-        int_btn |= BUTTON_RIGHT;
+        btn |= BUTTON_RIGHT;
     if (!GPIOC_PIN(5))
-        int_btn |= BUTTON_UP;
+        btn |= BUTTON_UP;
     if (!GPIOC_PIN(4))
-        int_btn |= BUTTON_SELECT;
+        btn |= BUTTON_SELECT;
     if (!GPIOC_PIN(3))
-        int_btn |= BUTTON_DOWN;
+        btn |= BUTTON_DOWN;
 
     /* return to settings needed for lcd */
     GPIOC_DIR = dir_save_c;
     GPIOC_AFSEL = afsel_save_c;
-}
 
-/*
- * Get button pressed from hardware
- */
-int button_read_device(void)
-{
-    /* Read buttons directly */
-    button_int();
+    if(lcd_button_support())
+        button_read_dbop();
+
+    if(_dbop_din & (1<<6))
+        btn |= BUTTON_LEFT;
+
 #ifndef BOOTLOADER
     /* light handling */
     if (hold_button != hold_button_old)
@@ -107,5 +130,5 @@ int button_read_device(void)
     }
 #endif /* BOOTLOADER */
 
-    return int_btn;
+    return btn;
 }
diff --git a/firmware/target/arm/as3525/sansa-c200v2/lcd-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/lcd-c200v2.c
deleted file mode 100644
index e16b082..0000000
--- a/firmware/target/arm/as3525/sansa-c200v2/lcd-c200v2.c
+++ /dev/null
@@ -1,429 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id: lcd-e200v2.c 19453 2008-12-16 02:50:39Z saratoga $
- *
- * Copyright (C) 2004 by Linus Nielsen Feltzing
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * 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)
-{
-    /* This is just arbitrary - the OF does something more complex */
-    x *= 1024;
-    while (x--);
-}
-
-/* DBOP initialisation, do what OF does */
-static void ams3525_dbop_init(void)
-{
-    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_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 */
-}
-
-
-static void lcd_write_cmd(int 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)
-{
-    (void)yesno;
-}
-
-static void flip_lcd(bool yesno)
-{
-    (void)yesno;
-}
-
-
-/* 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? */
-
-    if (display_on)
-        flip_lcd(yesno);
-}
-
-static void _display_on(void)
-{
-    /* Initialisation the display the same way as the original firmware */
-
-    lcd_write_reg(R_START_OSC, 0x0001); /* Start Oscilation */
-
-    lcd_write_reg(R_DRV_OUTPUT_CONTROL, 0x011b); /* 220 lines, GS=0, SS=1 */
-
-    /* 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);
-
-    /* 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);
-
-    /* Replace data on writing to GRAM */
-    lcd_write_reg(R_COMPARE_REG1, 0);
-    lcd_write_reg(R_COMPARE_REG2, 0);
-
-    lcd_write_reg(R_DISP_CONTROL1, 0x0000);  /* GON = 0, DTE = 0, D1-0 = 00b */
-
-    /* Front porch lines: 2; Back porch lines: 2; */
-    lcd_write_reg(R_DISP_CONTROL2, 0x0203);
-
-    /* Scan cycle = 0 frames */
-    lcd_write_reg(R_DISP_CONTROL3, 0x0000);
-
-    /* 16 clocks */
-    lcd_write_reg(R_FRAME_CYCLE_CONTROL, 0x0000);
-
-    /* 18-bit RGB interface (one transfer/pixel)
-     * internal clock operation;
-     * System interface/VSYNC interface */
-    lcd_write_reg(R_EXT_DISP_IF_CONTROL, 0x0000);
-
-
-    /* zero everything*/
-    lcd_write_reg(R_POWER_CONTROL1, 0x0000); /* STB = 0, SLP = 0 */
-
-    lcd_delay(10);
-
-    /* initialise power supply */
-
-    /* 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); 
-
-    /* VRH3-0 = 1000b: Vreg1OUT = REGP * 1.90 */
-    lcd_write_reg(R_POWER_CONTROL3, 0x0008);
-
-    lcd_delay(40);
-    
-    lcd_write_reg(R_POWER_CONTROL4, 0x0000); /* VCOMG = 0 */
-
-    /* This register is unknown */
-    lcd_write_reg(0x56, 0x80f);
-
-
-    lcd_write_reg(R_POWER_CONTROL1, 0x4140);
-
-    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 init */
-void lcd_init_device(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);
-
-    lcd_delay(1);
-
-    _display_on();
-}
-
-void lcd_enable(bool on)
-{
-    if(display_on!=on)
-    {
-        if(on)
-        {
-            _display_on();
-            lcd_activation_call_hook();
-        }
-        else
-        {
-            /* TODO: Implement off sequence */
-            display_on=false;
-        }
-    }
-}
-
-bool lcd_active(void)
-{
-    return display_on;
-}
-
-void lcd_sleep(void)
-{
-    /* TODO */
-}
-
-/*** 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_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;
-}
-
-/* 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);
-
-    /* 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_write_cmd(R_WRITE_DATA_2_GRAM);
-
-    lcd_write_data((unsigned short *)lcd_framebuffer, LCD_WIDTH*LCD_HEIGHT);
-    
-} /* lcd_update */
-
-
-/* Update a fraction of the display. */
-void lcd_update_rect(int x, int y, int width, int height)
-{
-    int ymax;
-    const unsigned short *ptr;
-
-    if (!display_on)
-        return;
-
-    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 */
diff --git a/firmware/target/arm/lcd-c200.c b/firmware/target/arm/lcd-c200.c
new file mode 100644
index 0000000..462d619
--- /dev/null
+++ b/firmware/target/arm/lcd-c200.c
@@ -0,0 +1,455 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "config.h"
+#include "cpu.h"
+#include "lcd.h"
+#include "kernel.h"
+#include "system.h"
+
+#ifdef SANSA_C200V2
+/* button driver needs to know if a lcd operation is in progress */
+static bool lcd_busy = false;
+#endif
+
+/* Display status */
+static unsigned lcd_yuv_options SHAREDBSS_ATTR = 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
+
+#if defined(SANSA_C200)
+/* wait for LCD */
+static inline void lcd_wait_write(void)
+{
+    while (LCD1_CONTROL & LCD1_BUSY_MASK);
+}
+
+/* send LCD data */
+static void lcd_send_data(const fb_data *data, int width)
+{
+    while(width--)
+    {
+        lcd_wait_write();
+        LCD1_DATA = *data >> 8;
+        lcd_wait_write();
+        LCD1_DATA = *data++ & 0xff;
+    }
+}
+
+/* send LCD command */
+static void lcd_send_command(unsigned char cmd, unsigned char arg)
+{
+    lcd_wait_write();
+    LCD1_CMD = cmd;
+    /* if the argument is 0, we send a NOP (= 0) command */
+    lcd_wait_write();
+    LCD1_CMD = arg;
+}
+
+static inline void c200v1_init(void)
+{
+    /* This is from the c200 of bootloader beginning at offset 0xbbf4 */
+    outl(inl(0x70000010) & ~0xfc000000, 0x70000010);
+    outl(inl(0x70000010), 0x70000010);
+
+    DEV_INIT2 &= ~0x400;
+    udelay(10000);
+
+    LCD1_CONTROL &= ~0x4;
+    udelay(15);
+
+    LCD1_CONTROL |= 0x4;
+    udelay(10);
+
+    LCD1_CONTROL = 0x0084; /* bits (9,10) = 00 -> fastest setting */
+    udelay(10000);
+}
+
+static inline void lcd_delay(int delay)
+{
+    udelay(delay * 1000);
+}
+
+#elif defined(SANSA_C200V2)
+
+static inline void lcd_delay(int delay)
+{   //TUNEME : delay is in milliseconds
+    delay <<= 14;
+    while(delay--) ;
+}
+
+/* send LCD data */
+static void lcd_send_data(const fb_data *data, int width)
+{
+    while(width--)
+    {
+        DBOP_DOUT = *data << 8 | *data >> 8;
+        data++;
+        while ((DBOP_STAT & (1<<10)) == 0);
+    }
+}
+
+/* send LCD command */
+static void lcd_send_command(unsigned char cmd, unsigned char val)
+{
+    DBOP_TIMPOL_23 = 0xa167006e;
+
+    DBOP_DOUT = cmd | val << 8;
+
+    while ((DBOP_STAT & (1<<10)) == 0);
+
+    DBOP_TIMPOL_23 = 0xa167e06f;
+}
+
+static inline void as3525_dbop_init(void)
+{
+    CGU_DBOP = (1<<3) | AS3525_DBOP_DIV;
+
+    DBOP_TIMPOL_01 = 0xe167e167;
+    DBOP_TIMPOL_23 = 0xe167006e;
+    DBOP_CTRL = 0x40008;
+
+    GPIOB_AFSEL = 0xc;
+    GPIOC_AFSEL = 0xff;
+
+    DBOP_TIMPOL_23 = 0x6006e;
+    DBOP_CTRL = 0x52008;
+    DBOP_TIMPOL_01 = 0x6e167;
+    DBOP_TIMPOL_23 = 0xa167e06f;
+
+    lcd_delay(20);
+}
+
+/* we need to set the DBOP_DOUT pins high, for correct dbop reads */
+bool lcd_button_support(void)
+{
+    const fb_data data = 0xffff;
+
+    if (lcd_busy)       /* we can't use dbop for reading if we are in the */
+        return false;   /* middle of a write operation */
+
+    /* use out of screen coordinates */
+    lcd_send_command(R_X_ADDR_AREA, 0);
+    lcd_send_command(1, 0);
+    lcd_send_command(R_Y_ADDR_AREA, 0);
+    lcd_send_command(1, 0);
+
+    lcd_send_data(&data, 1);
+
+    return true;
+}
+#endif
+
+/* LCD init */
+void lcd_init_device(void)
+{
+#if defined(SANAS_C200)
+    c200v1_lcd_init();
+#elif defined(SANSA_C200V2)
+    as3525_dbop_init();
+#endif
+
+    lcd_send_command(R_STANDBY_OFF, 0);
+    lcd_delay(20);
+
+    lcd_send_command(R_OSCILLATION_MODE, 0x01);
+    lcd_delay(20);
+
+    lcd_send_command(R_DCDC_AMP_ONOFF, 0x01);
+    lcd_delay(20);
+
+    lcd_send_command(R_DCDC_AMP_ONOFF, 0x09);
+    lcd_delay(20);
+
+    lcd_send_command(R_DCDC_AMP_ONOFF, 0x0b);
+    lcd_delay(20);
+
+    lcd_send_command(R_DCDC_AMP_ONOFF, 0x0f);
+    lcd_delay(20);
+
+    lcd_send_command(R_DRIVER_OUTPUT_MODE, 0x07);
+
+    lcd_send_command(R_DCDC_SET, 0x03);
+
+    lcd_send_command(R_DCDC_CLOCK_DIV, 0x03);
+
+    lcd_send_command(R_TEMP_COMPENSATION, 0x01);
+
+    lcd_send_command(R_CONTRAST_CONTROL1, 0x55);
+
+    lcd_send_command(R_ADDRESSING_MODE, 0x10);
+
+    lcd_send_command(R_ROW_VECTOR_MODE, 0x0e);
+
+    lcd_send_command(R_N_LINE_INVERSION, 0xdf);
+
+    lcd_send_command(R_FRAME_FREQ_CONTROL, 0);
+
+    lcd_send_command(R_ENTRY_MODE, 0x82);
+
+    lcd_send_command(R_X_ADDR_AREA, 0);         /* horizontal dimensions */
+    lcd_send_command(LCD_WIDTH - 1, 0);         /* x2 */
+
+    lcd_send_command(R_Y_ADDR_AREA, 0x1a);     /* vertical dimensions */
+    lcd_send_command(LCD_HEIGHT - 1 + 0x1a, 0);   /* y2 + 0x1a */
+    lcd_delay(10);
+
+    lcd_send_command(R_DISPLAY_ON, 0);
+}
+
+/*** hardware configuration ***/
+int lcd_default_contrast(void)
+{
+    return DEFAULT_CONTRAST_SETTING;
+}
+
+void lcd_set_contrast(int val)
+{
+#ifdef SANSA_C200V2
+    lcd_busy = true;
+#endif
+    lcd_send_command(R_CONTRAST_CONTROL1, val);
+#ifdef SANSA_C200V2
+    lcd_busy = false;
+#endif
+}
+
+void lcd_set_invert_display(bool yesno)
+{
+    /* TODO: Implement lcd_set_invert_display() */
+    (void)yesno;
+}
+
+#if defined(HAVE_LCD_ENABLE)
+void lcd_enable(bool yesno)
+{
+    if (yesno == is_lcd_enabled)
+        return;
+
+#ifdef SANSA_C200V2
+    lcd_busy = true;
+#endif
+    if ((is_lcd_enabled = yesno))
+    {
+        lcd_send_command(R_STANDBY_OFF, 0);
+        lcd_send_command(R_DISPLAY_ON, 0);
+        lcd_activation_call_hook();
+    }
+    else
+    {
+        lcd_send_command(R_STANDBY_ON, 0);
+    }
+#ifdef SANSA_C200V2
+    lcd_busy = false;
+#endif
+}
+#endif
+
+#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
+bool lcd_active(void)
+{
+    return is_lcd_enabled;
+}
+#endif
+
+
+/* turn the display upside down (call lcd_update() afterwards) */
+void lcd_set_flip(bool yesno)
+{
+#ifdef SANSA_C200V2
+    lcd_busy = true;
+#endif
+    lcd_send_command(R_DRIVER_OUTPUT_MODE, yesno ? 0x02 : 0x07);
+#ifdef SANSA_C200V2
+    lcd_busy = false;
+#endif
+}
+
+/*** update functions ***/
+
+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)
+{
+    unsigned char const * yuv_src[3];
+    off_t z;
+
+#ifdef SANSA_C200V2
+    lcd_busy = true;
+#endif
+
+    /* Sorry, but width and height must be >= 2 or else */
+    width &= ~1;
+    height >>= 1;
+
+    y += 0x1a;
+
+    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]);
+
+    lcd_send_command(R_ENTRY_MODE, 0x80);
+
+    lcd_send_command(R_X_ADDR_AREA, x);
+    lcd_send_command(x + width - 1, 0);
+
+    if (lcd_yuv_options & LCD_YUV_DITHER)
+    {
+        do
+        {
+            lcd_send_command(R_Y_ADDR_AREA, y);
+            lcd_send_command(y + 1, 0);
+
+#ifndef SANSA_C200V2 // TODO
+            lcd_write_yuv420_lines_odither(yuv_src, width, stride, x, y);
+#endif
+            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);
+            lcd_send_command(y + 1, 0);
+
+#ifndef SANSA_C200V2 // TODO
+            lcd_write_yuv420_lines(yuv_src, width, stride);
+#endif
+            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);
+    }
+
+#ifdef SANSA_C200V2
+    lcd_busy = false;
+#endif
+}
+
+/* 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)
+{
+    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];
+
+#ifdef SANSA_C200V2
+    lcd_busy = true;
+#endif
+
+    if (width <= 1) {
+        /* The X end address must be larger than the X start address, so we
+         * switch to vertical mode for single column updates and set the
+         * window width to 2 */
+        lcd_send_command(R_ENTRY_MODE, 0x80);
+        lcd_send_command(R_X_ADDR_AREA, x);
+        lcd_send_command(x + 1, 0);
+    } else {
+        lcd_send_command(R_ENTRY_MODE, 0x82);
+        lcd_send_command(R_X_ADDR_AREA, x);
+        lcd_send_command(x + width - 1, 0);
+    }
+
+    lcd_send_command(R_Y_ADDR_AREA, y + 0x1a);
+    lcd_send_command(y + height - 1 + 0x1a, 0);
+
+    do {
+        lcd_send_data(addr, width);
+        addr += LCD_WIDTH;
+    } while (--height > 0);
+
+#ifdef SANSA_C200V2
+    lcd_busy = false;
+#endif
+}
diff --git a/firmware/target/arm/sandisk/sansa-c200/lcd-c200.c b/firmware/target/arm/sandisk/sansa-c200/lcd-c200.c
deleted file mode 100644
index 6957845..0000000
--- a/firmware/target/arm/sandisk/sansa-c200/lcd-c200.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * 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
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-#include "config.h"
-#include "cpu.h"
-#include "lcd.h"
-#include "kernel.h"
-#include "system.h"
-
-/* Display status */
-static unsigned lcd_yuv_options SHAREDBSS_ATTR = 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
-
-
-/* wait for LCD */
-static inline void lcd_wait_write(void)
-{
-    while (LCD1_CONTROL & LCD1_BUSY_MASK);
-}
-
-/* send LCD data */
-static void lcd_send_data(unsigned data)
-{
-    lcd_wait_write();
-    LCD1_DATA = data >> 8;
-    lcd_wait_write();
-    LCD1_DATA = data & 0xff;
-}
-
-/* send LCD command */
-static void lcd_send_command(unsigned cmd)
-{
-    lcd_wait_write();
-    LCD1_CMD = cmd;
-}
-
-/* LCD init */
-void lcd_init_device(void)
-{
-    /* This is from the c200 of bootloader beginning at offset 0xbbf4 */
-    outl(inl(0x70000010) & ~0xfc000000, 0x70000010);
-    outl(inl(0x70000010), 0x70000010);
-
-    DEV_INIT2 &= ~0x400;
-    udelay(10000);
-    
-    LCD1_CONTROL &= ~0x4;
-    udelay(15);
-
-    LCD1_CONTROL |= 0x4;
-    udelay(10);
-
-    LCD1_CONTROL = 0x0084; /* bits (9,10) = 00 -> fastest setting */
-    udelay(10000);
-
-    lcd_send_command(R_STANDBY_OFF);
-    udelay(20000);
-
-    lcd_send_command(R_OSCILLATION_MODE);
-    lcd_send_command(0x01);
-    udelay(20000);
-
-    lcd_send_command(R_DCDC_AMP_ONOFF);
-    lcd_send_command(0x01);
-    udelay(20000);
-
-    lcd_send_command(R_DCDC_AMP_ONOFF);
-    lcd_send_command(0x09);
-    udelay(20000);
-
-    lcd_send_command(R_DCDC_AMP_ONOFF);
-    lcd_send_command(0x0b);
-    udelay(20000);
-
-    lcd_send_command(R_DCDC_AMP_ONOFF);
-    lcd_send_command(0x0f);
-    udelay(20000);
-
-    lcd_send_command(R_DRIVER_OUTPUT_MODE);
-    lcd_send_command(0x07);
-
-    lcd_send_command(R_DCDC_SET);
-    lcd_send_command(0x03);
-
-    lcd_send_command(R_DCDC_CLOCK_DIV);
-    lcd_send_command(0x03);
-
-    lcd_send_command(R_TEMP_COMPENSATION);
-    lcd_send_command(0x01);
-
-    lcd_send_command(R_CONTRAST_CONTROL1);
-    lcd_send_command(0x55);
-
-    lcd_send_command(R_ADDRESSING_MODE);
-    lcd_send_command(0x10);
-
-    lcd_send_command(R_ROW_VECTOR_MODE);
-    lcd_send_command(0x0e);
-
-    lcd_send_command(R_N_LINE_INVERSION);
-    lcd_send_command(0x0d);
-
-    lcd_send_command(R_FRAME_FREQ_CONTROL);
-    lcd_send_command(0);
-
-    lcd_send_command(R_ENTRY_MODE);
-    lcd_send_command(0x82);
-
-    lcd_send_command(R_Y_ADDR_AREA);         /* vertical dimensions */
-    lcd_send_command(0x1a);                  /* y1 + 0x1a */
-    lcd_send_command(LCD_HEIGHT - 1 + 0x1a); /* y2 + 0x1a */
-
-    lcd_send_command(R_X_ADDR_AREA);         /* horizontal dimensions */
-    lcd_send_command(0);                     /* x1 */
-    lcd_send_command(LCD_WIDTH - 1);         /* x2 */
-    udelay(100000);
-
-    lcd_send_command(R_DISPLAY_ON);
-}
-
-/*** hardware configuration ***/
-int lcd_default_contrast(void)
-{
-    return DEFAULT_CONTRAST_SETTING;
-}
-
-void lcd_set_contrast(int val)
-{
-    lcd_send_command(R_CONTRAST_CONTROL1);
-    lcd_send_command(val);
-}
-
-void lcd_set_invert_display(bool yesno)
-{
-    /* TODO: Implement lcd_set_invert_display() */
-    (void)yesno;
-}
-
-#if defined(HAVE_LCD_ENABLE)
-void lcd_enable(bool yesno)
-{
-    if (yesno == is_lcd_enabled)
-        return;
-
-    if ((is_lcd_enabled = yesno))
-    {
-        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 is_lcd_enabled;
-}
-#endif
-
-
-/* turn the display upside down (call lcd_update() afterwards) */
-void lcd_set_flip(bool yesno)
-{
-    lcd_send_command(R_DRIVER_OUTPUT_MODE);
-    lcd_send_command(yesno ? 0x02 : 0x07);
-}
-
-/*** update functions ***/
-
-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)
-{
-    unsigned char const * yuv_src[3];
-    off_t z;
-
-    /* Sorry, but width and height must be >= 2 or else */
-    width &= ~1;
-    height >>= 1;
-    
-    y += 0x1a;
-
-    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]);
-
-    lcd_send_command(R_ENTRY_MODE);
-    lcd_send_command(0x80);
-
-    lcd_send_command(R_X_ADDR_AREA);
-    lcd_send_command(x);
-    lcd_send_command(x + width - 1);
-
-    if (lcd_yuv_options & LCD_YUV_DITHER)
-    {
-        do
-        {
-            lcd_send_command(R_Y_ADDR_AREA);
-            lcd_send_command(y);
-            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);
-            lcd_send_command(y);
-            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)
-{
-    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); /* switch to vertical mode for */
-        lcd_send_command(x);             /* 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);
-        lcd_send_command(x);
-        lcd_send_command(x + width - 1);
-    }
-
-    lcd_send_command(R_Y_ADDR_AREA);
-    lcd_send_command(y + 0x1a);
-    lcd_send_command(y + height - 1 + 0x1a);
-
-    /* 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);
-}