summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ryabinin <ryabinin.a.a@gmail.com>2013-11-05 11:10:07 +0400
committerAndrew Ryabinin <ryabinin.a.a@gmail.com>2013-11-05 13:34:52 +0400
commit357dd680b404cf5e749e315436db8e056bd2bc65 (patch)
treee0fed7b0921fa1c10c71375428d0d8672f741dfe
parenta7fa7b902e0471faad3d707944112ff4d56575f6 (diff)
downloadrockbox-357dd680b404cf5e749e315436db8e056bd2bc65.tar.gz
rockbox-357dd680b404cf5e749e315436db8e056bd2bc65.zip
ma8/ma9: Cleanup - fix tabs, remove unused defines.
-rw-r--r--firmware/drivers/audio/pcm1792.c16
-rw-r--r--firmware/target/arm/rk27xx/ma/lcd-ma.c116
2 files changed, 64 insertions, 68 deletions
diff --git a/firmware/drivers/audio/pcm1792.c b/firmware/drivers/audio/pcm1792.c
index 67237a920a..a048d07eb3 100644
--- a/firmware/drivers/audio/pcm1792.c
+++ b/firmware/drivers/audio/pcm1792.c
@@ -84,24 +84,24 @@ static int vol_tenthdb2hw(const int tdb)
84 84
85void audiohw_init(void) 85void audiohw_init(void)
86{ 86{
87 pcm1792_write_reg(PCM1792_REG(18), REG18_INIT_VALUE); 87 pcm1792_write_reg(PCM1792_REG(18), REG18_INIT_VALUE);
88 pcm1792_write_reg(PCM1792_REG(19), REG19_INIT_VALUE); 88 pcm1792_write_reg(PCM1792_REG(19), REG19_INIT_VALUE);
89 pcm1792_write_reg(PCM1792_REG(20), REG20_INIT_VALUE); 89 pcm1792_write_reg(PCM1792_REG(20), REG20_INIT_VALUE);
90 pcm1792_write_reg(PCM1792_REG(21), REG21_INIT_VALUE); 90 pcm1792_write_reg(PCM1792_REG(21), REG21_INIT_VALUE);
91 91
92 /* Left & Right volumes */ 92 /* Left & Right volumes */
93 pcm1792_write_reg(PCM1792_REG(16), 0xff); 93 pcm1792_write_reg(PCM1792_REG(16), 0xff);
94 pcm1792_write_reg(PCM1792_REG(17), 0xff); 94 pcm1792_write_reg(PCM1792_REG(17), 0xff);
95} 95}
96 96
97void audiohw_mute(void) 97void audiohw_mute(void)
98{ 98{
99 pcm1792_write_reg(PCM1792_REG(18), REG18_INIT_VALUE|PCM1792_MUTE_ON); 99 pcm1792_write_reg(PCM1792_REG(18), REG18_INIT_VALUE|PCM1792_MUTE_ON);
100} 100}
101 101
102void audiohw_unmute(void) 102void audiohw_unmute(void)
103{ 103{
104 pcm1792_write_reg(PCM1792_REG(18), REG18_INIT_VALUE); 104 pcm1792_write_reg(PCM1792_REG(18), REG18_INIT_VALUE);
105} 105}
106 106
107void audiohw_preinit(void) 107void audiohw_preinit(void)
diff --git a/firmware/target/arm/rk27xx/ma/lcd-ma.c b/firmware/target/arm/rk27xx/ma/lcd-ma.c
index 3fecce2d18..fa3ccc5aa0 100644
--- a/firmware/target/arm/rk27xx/ma/lcd-ma.c
+++ b/firmware/target/arm/rk27xx/ma/lcd-ma.c
@@ -27,10 +27,6 @@
27#include "cpu.h" 27#include "cpu.h"
28#include "lcdif-rk27xx.h" 28#include "lcdif-rk27xx.h"
29 29
30#define ILI9342 0
31#define ILI9342C 1
32#define LCD_DRIVER ILI9342C
33
34static bool display_on = false; 30static bool display_on = false;
35 31
36#if (CONFIG_LCD == LCD_ILI9342C) 32#if (CONFIG_LCD == LCD_ILI9342C)
@@ -38,62 +34,62 @@ void lcd_display_init(void)
38{ 34{
39 unsigned int x, y; 35 unsigned int x, y;
40 36
41 lcd_cmd(0xC8); 37 lcd_cmd(0xC8);
42 lcd_data(0xFF); 38 lcd_data(0xFF);
43 lcd_data(0x93); 39 lcd_data(0x93);
44 lcd_data(0x42); 40 lcd_data(0x42);
45 41
46 lcd_write_reg(0x36, 0xC8); 42 lcd_write_reg(0x36, 0xC8);
47 43
48 lcd_write_reg(0x3A, 0x55); 44 lcd_write_reg(0x3A, 0x55);
49 45
50 lcd_cmd(0xC0); 46 lcd_cmd(0xC0);
51 lcd_data(0x14); 47 lcd_data(0x14);
52 lcd_data(0x0E); 48 lcd_data(0x0E);
53 49
54 lcd_write_reg(0xC1, 0x01); 50 lcd_write_reg(0xC1, 0x01);
55 51
56 lcd_write_reg(0xC5, 0xF4); 52 lcd_write_reg(0xC5, 0xF4);
57 53
58 lcd_cmd(0xB1); 54 lcd_cmd(0xB1);
59 lcd_data(0x00); 55 lcd_data(0x00);
60 lcd_data(0x1B); 56 lcd_data(0x1B);
61 57
62 lcd_write_reg(0xB4, 0x02); 58 lcd_write_reg(0xB4, 0x02);
63 59
64 lcd_cmd(0xE0); 60 lcd_cmd(0xE0);
65 lcd_data(0x00); 61 lcd_data(0x00);
66 lcd_data(0x0A); 62 lcd_data(0x0A);
67 lcd_data(0x11); 63 lcd_data(0x11);
68 lcd_data(0x08); 64 lcd_data(0x08);
69 lcd_data(0x16); 65 lcd_data(0x16);
70 lcd_data(0x0A); 66 lcd_data(0x0A);
71 lcd_data(0x3C); 67 lcd_data(0x3C);
72 lcd_data(0x9B); 68 lcd_data(0x9B);
73 lcd_data(0x4A); 69 lcd_data(0x4A);
74 lcd_data(0x09); 70 lcd_data(0x09);
75 lcd_data(0x0E); 71 lcd_data(0x0E);
76 lcd_data(0x0A); 72 lcd_data(0x0A);
77 lcd_data(0x1C); 73 lcd_data(0x1C);
78 lcd_data(0x1D); 74 lcd_data(0x1D);
79 lcd_data(0x0F); 75 lcd_data(0x0F);
80 76
81 lcd_cmd(0xE1); 77 lcd_cmd(0xE1);
82 lcd_data(0x00); 78 lcd_data(0x00);
83 lcd_data(0x23); 79 lcd_data(0x23);
84 lcd_data(0x25); 80 lcd_data(0x25);
85 lcd_data(0x04); 81 lcd_data(0x04);
86 lcd_data(0x10); 82 lcd_data(0x10);
87 lcd_data(0x07); 83 lcd_data(0x07);
88 lcd_data(0x39); 84 lcd_data(0x39);
89 lcd_data(0x46); 85 lcd_data(0x46);
90 lcd_data(0x4A); 86 lcd_data(0x4A);
91 lcd_data(0x03); 87 lcd_data(0x03);
92 lcd_data(0x0C); 88 lcd_data(0x0C);
93 lcd_data(0x0A); 89 lcd_data(0x0A);
94 lcd_data(0x31); 90 lcd_data(0x31);
95 lcd_data(0x36); 91 lcd_data(0x36);
96 lcd_data(0x0F); 92 lcd_data(0x0F);
97 93
98 /* exit sleep */ 94 /* exit sleep */
99 lcd_cmd(0x11); 95 lcd_cmd(0x11);