diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2010-07-31 12:43:38 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2010-07-31 12:43:38 +0000 |
commit | 4a8ea6c9d9b0db1de59ee4d2b9cc0125caa990c7 (patch) | |
tree | a3c6697c6de315cfab1f839191b1d62293978bca | |
parent | c2529c341d4ecb8bea28f99f0f9e28e70c311487 (diff) | |
download | rockbox-4a8ea6c9d9b0db1de59ee4d2b9cc0125caa990c7.tar.gz rockbox-4a8ea6c9d9b0db1de59ee4d2b9cc0125caa990c7.zip |
Various minor clean-ups for Zen Vision
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27636 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/drivers/audio/tlv320.c | 9 | ||||
-rw-r--r-- | firmware/drivers/isp1583.c | 5 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/creative-zvm/powermgmt-creativezvm.c | 5 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/debug-dm320.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/spi-dm320.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/uart-dm320.c | 2 |
6 files changed, 14 insertions, 12 deletions
diff --git a/firmware/drivers/audio/tlv320.c b/firmware/drivers/audio/tlv320.c index b537fd5773..dc19023521 100644 --- a/firmware/drivers/audio/tlv320.c +++ b/firmware/drivers/audio/tlv320.c | |||
@@ -69,14 +69,14 @@ int tenthdb2master(int db) | |||
69 | #define TLV320_ADDR 0x1A | 69 | #define TLV320_ADDR 0x1A |
70 | #endif | 70 | #endif |
71 | 71 | ||
72 | struct tlv320_info | 72 | static struct tlv320_info |
73 | { | 73 | { |
74 | int vol_l; | 74 | int vol_l; |
75 | int vol_r; | 75 | int vol_r; |
76 | } tlv320; | 76 | } tlv320; |
77 | 77 | ||
78 | /* Shadow registers */ | 78 | /* Shadow registers */ |
79 | unsigned tlv320_regs[0xf]; | 79 | static unsigned tlv320_regs[0xf]; |
80 | 80 | ||
81 | static void tlv320_write_reg(unsigned reg, unsigned value) | 81 | static void tlv320_write_reg(unsigned reg, unsigned value) |
82 | { | 82 | { |
@@ -304,8 +304,8 @@ void audiohw_disable_recording(void) | |||
304 | value_pc |= PC_ADC | PC_MIC | PC_LINE; /* ADC, MIC and LINE off */ | 304 | value_pc |= PC_ADC | PC_MIC | PC_LINE; /* ADC, MIC and LINE off */ |
305 | tlv320_write_reg(REG_PC, value_pc); | 305 | tlv320_write_reg(REG_PC, value_pc); |
306 | } | 306 | } |
307 | #endif | ||
308 | 307 | ||
308 | #ifdef HAVE_FMRADIO_IN | ||
309 | void audiohw_set_monitor(bool enable) | 309 | void audiohw_set_monitor(bool enable) |
310 | { | 310 | { |
311 | unsigned value_aap, value_pc; | 311 | unsigned value_aap, value_pc; |
@@ -325,3 +325,6 @@ void audiohw_set_monitor(bool enable) | |||
325 | tlv320_write_reg(REG_AAP, value_aap); | 325 | tlv320_write_reg(REG_AAP, value_aap); |
326 | tlv320_write_reg(REG_PC, value_pc); | 326 | tlv320_write_reg(REG_PC, value_pc); |
327 | } | 327 | } |
328 | #endif /* HAVE_FMRADIO_IN */ | ||
329 | #endif /* HAVE_RECORDING */ | ||
330 | |||
diff --git a/firmware/drivers/isp1583.c b/firmware/drivers/isp1583.c index 26d638171c..f45ff6eb5e 100644 --- a/firmware/drivers/isp1583.c +++ b/firmware/drivers/isp1583.c | |||
@@ -397,15 +397,16 @@ static void setup_endpoints(void) | |||
397 | ZVM_SPECIFIC; | 397 | ZVM_SPECIFIC; |
398 | } | 398 | } |
399 | 399 | ||
400 | void usb_helper(void) | 400 | #if 0 /* currently unused */ |
401 | static void usb_helper(void) | ||
401 | { | 402 | { |
402 | if(ISP1583_GEN_INT_READ & ISP1583_INIT_INTEN_READ) | 403 | if(ISP1583_GEN_INT_READ & ISP1583_INIT_INTEN_READ) |
403 | { | 404 | { |
404 | logf("Helper detected interrupt... [%d]", (int)current_tick); | 405 | logf("Helper detected interrupt... [%d]", (int)current_tick); |
405 | usb_drv_int(); | 406 | usb_drv_int(); |
406 | } | 407 | } |
407 | return; | ||
408 | } | 408 | } |
409 | #endif | ||
409 | 410 | ||
410 | void usb_drv_init(void) | 411 | void usb_drv_init(void) |
411 | { | 412 | { |
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/powermgmt-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/powermgmt-creativezvm.c index d85ade18c3..a6d19347c4 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/powermgmt-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/powermgmt-creativezvm.c | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | /* THIS CONTAINS CURRENTLY DUMMY CODE! */ | 27 | /* THIS CONTAINS CURRENTLY DUMMY CODE! */ |
28 | 28 | ||
29 | unsigned short current_voltage = 3910; | 29 | static const unsigned short current_voltage = 3910; |
30 | const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = | 30 | const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = |
31 | { | 31 | { |
32 | 0 | 32 | 0 |
@@ -48,9 +48,6 @@ const unsigned short percent_to_volt_charge[11] = | |||
48 | { | 48 | { |
49 | 100, 300, 400, 500, 600, 700, 800, 900, 1000, 1200, 1320, | 49 | 100, 300, 400, 500, 600, 700, 800, 900, 1000, 1200, 1320, |
50 | }; | 50 | }; |
51 | void read_battery_inputs(void) | ||
52 | { | ||
53 | } | ||
54 | 51 | ||
55 | /* Returns battery voltage from ADC [millivolts] */ | 52 | /* Returns battery voltage from ADC [millivolts] */ |
56 | unsigned int battery_adc_voltage(void) | 53 | unsigned int battery_adc_voltage(void) |
diff --git a/firmware/target/arm/tms320dm320/debug-dm320.c b/firmware/target/arm/tms320dm320/debug-dm320.c index 8bf170048e..cc529f5d15 100644 --- a/firmware/target/arm/tms320dm320/debug-dm320.c +++ b/firmware/target/arm/tms320dm320/debug-dm320.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include "button.h" | 27 | #include "button.h" |
28 | #include "lcd.h" | 28 | #include "lcd.h" |
29 | #include "debug.h" | 29 | #include "debug.h" |
30 | #include "debug-target.h" | ||
30 | #include "font.h" | 31 | #include "font.h" |
31 | #include "lcd-target.h" | 32 | #include "lcd-target.h" |
32 | 33 | ||
diff --git a/firmware/target/arm/tms320dm320/spi-dm320.c b/firmware/target/arm/tms320dm320/spi-dm320.c index 222228aa8d..12ce0e0d5e 100644 --- a/firmware/target/arm/tms320dm320/spi-dm320.c +++ b/firmware/target/arm/tms320dm320/spi-dm320.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #define GIO_BL_ENABLE (1<<13) | 33 | #define GIO_BL_ENABLE (1<<13) |
34 | #define GIO_LCD_ENABLE (1<<5) | 34 | #define GIO_LCD_ENABLE (1<<5) |
35 | 35 | ||
36 | struct mutex spi_mtx; | 36 | static struct mutex spi_mtx; |
37 | 37 | ||
38 | struct SPI_info { | 38 | struct SPI_info { |
39 | volatile unsigned short *setreg; | 39 | volatile unsigned short *setreg; |
@@ -43,7 +43,7 @@ struct SPI_info { | |||
43 | char divider; | 43 | char divider; |
44 | }; | 44 | }; |
45 | 45 | ||
46 | struct SPI_info spi_targets[] = | 46 | static struct SPI_info spi_targets[] = |
47 | { | 47 | { |
48 | #ifndef CREATIVE_ZVx | 48 | #ifndef CREATIVE_ZVx |
49 | [SPI_target_TSC2100] = { &IO_GIO_BITCLR1, &IO_GIO_BITSET1, | 49 | [SPI_target_TSC2100] = { &IO_GIO_BITCLR1, &IO_GIO_BITSET1, |
diff --git a/firmware/target/arm/tms320dm320/uart-dm320.c b/firmware/target/arm/tms320dm320/uart-dm320.c index 55515aa406..7490695f0f 100644 --- a/firmware/target/arm/tms320dm320/uart-dm320.c +++ b/firmware/target/arm/tms320dm320/uart-dm320.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #define SEND_RING_SIZE 256 | 29 | #define SEND_RING_SIZE 256 |
30 | #define RECEIVE_RING_SIZE 20 | 30 | #define RECEIVE_RING_SIZE 20 |
31 | 31 | ||
32 | char | 32 | static char |
33 | uart1_send_buffer_ring[SEND_RING_SIZE], | 33 | uart1_send_buffer_ring[SEND_RING_SIZE], |
34 | uart1_receive_buffer_ring[RECEIVE_RING_SIZE]; | 34 | uart1_receive_buffer_ring[RECEIVE_RING_SIZE]; |
35 | 35 | ||