From 357dd680b404cf5e749e315436db8e056bd2bc65 Mon Sep 17 00:00:00 2001 From: Andrew Ryabinin Date: Tue, 5 Nov 2013 11:10:07 +0400 Subject: ma8/ma9: Cleanup - fix tabs, remove unused defines. --- firmware/drivers/audio/pcm1792.c | 16 ++--- firmware/target/arm/rk27xx/ma/lcd-ma.c | 116 ++++++++++++++++----------------- 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) void audiohw_init(void) { - pcm1792_write_reg(PCM1792_REG(18), REG18_INIT_VALUE); - pcm1792_write_reg(PCM1792_REG(19), REG19_INIT_VALUE); - pcm1792_write_reg(PCM1792_REG(20), REG20_INIT_VALUE); - pcm1792_write_reg(PCM1792_REG(21), REG21_INIT_VALUE); + pcm1792_write_reg(PCM1792_REG(18), REG18_INIT_VALUE); + pcm1792_write_reg(PCM1792_REG(19), REG19_INIT_VALUE); + pcm1792_write_reg(PCM1792_REG(20), REG20_INIT_VALUE); + pcm1792_write_reg(PCM1792_REG(21), REG21_INIT_VALUE); /* Left & Right volumes */ - pcm1792_write_reg(PCM1792_REG(16), 0xff); - pcm1792_write_reg(PCM1792_REG(17), 0xff); + pcm1792_write_reg(PCM1792_REG(16), 0xff); + pcm1792_write_reg(PCM1792_REG(17), 0xff); } void audiohw_mute(void) { - pcm1792_write_reg(PCM1792_REG(18), REG18_INIT_VALUE|PCM1792_MUTE_ON); + pcm1792_write_reg(PCM1792_REG(18), REG18_INIT_VALUE|PCM1792_MUTE_ON); } void audiohw_unmute(void) { - pcm1792_write_reg(PCM1792_REG(18), REG18_INIT_VALUE); + pcm1792_write_reg(PCM1792_REG(18), REG18_INIT_VALUE); } void 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 @@ #include "cpu.h" #include "lcdif-rk27xx.h" -#define ILI9342 0 -#define ILI9342C 1 -#define LCD_DRIVER ILI9342C - static bool display_on = false; #if (CONFIG_LCD == LCD_ILI9342C) @@ -38,62 +34,62 @@ void lcd_display_init(void) { unsigned int x, y; - lcd_cmd(0xC8); - lcd_data(0xFF); - lcd_data(0x93); - lcd_data(0x42); - - lcd_write_reg(0x36, 0xC8); - - lcd_write_reg(0x3A, 0x55); - - lcd_cmd(0xC0); - lcd_data(0x14); - lcd_data(0x0E); - - lcd_write_reg(0xC1, 0x01); - - lcd_write_reg(0xC5, 0xF4); - - lcd_cmd(0xB1); - lcd_data(0x00); - lcd_data(0x1B); - - lcd_write_reg(0xB4, 0x02); - - lcd_cmd(0xE0); - lcd_data(0x00); - lcd_data(0x0A); - lcd_data(0x11); - lcd_data(0x08); - lcd_data(0x16); - lcd_data(0x0A); - lcd_data(0x3C); - lcd_data(0x9B); - lcd_data(0x4A); - lcd_data(0x09); - lcd_data(0x0E); - lcd_data(0x0A); - lcd_data(0x1C); - lcd_data(0x1D); - lcd_data(0x0F); - - lcd_cmd(0xE1); - lcd_data(0x00); - lcd_data(0x23); - lcd_data(0x25); - lcd_data(0x04); - lcd_data(0x10); - lcd_data(0x07); - lcd_data(0x39); - lcd_data(0x46); - lcd_data(0x4A); - lcd_data(0x03); - lcd_data(0x0C); - lcd_data(0x0A); - lcd_data(0x31); - lcd_data(0x36); - lcd_data(0x0F); + lcd_cmd(0xC8); + lcd_data(0xFF); + lcd_data(0x93); + lcd_data(0x42); + + lcd_write_reg(0x36, 0xC8); + + lcd_write_reg(0x3A, 0x55); + + lcd_cmd(0xC0); + lcd_data(0x14); + lcd_data(0x0E); + + lcd_write_reg(0xC1, 0x01); + + lcd_write_reg(0xC5, 0xF4); + + lcd_cmd(0xB1); + lcd_data(0x00); + lcd_data(0x1B); + + lcd_write_reg(0xB4, 0x02); + + lcd_cmd(0xE0); + lcd_data(0x00); + lcd_data(0x0A); + lcd_data(0x11); + lcd_data(0x08); + lcd_data(0x16); + lcd_data(0x0A); + lcd_data(0x3C); + lcd_data(0x9B); + lcd_data(0x4A); + lcd_data(0x09); + lcd_data(0x0E); + lcd_data(0x0A); + lcd_data(0x1C); + lcd_data(0x1D); + lcd_data(0x0F); + + lcd_cmd(0xE1); + lcd_data(0x00); + lcd_data(0x23); + lcd_data(0x25); + lcd_data(0x04); + lcd_data(0x10); + lcd_data(0x07); + lcd_data(0x39); + lcd_data(0x46); + lcd_data(0x4A); + lcd_data(0x03); + lcd_data(0x0C); + lcd_data(0x0A); + lcd_data(0x31); + lcd_data(0x36); + lcd_data(0x0F); /* exit sleep */ lcd_cmd(0x11); -- cgit v1.2.3