summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2010-01-03 11:31:14 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2010-01-03 11:31:14 +0000
commit508bf2b45a7bdd163c7bc7644900f2100f9fe137 (patch)
tree00b3f9e24d461ad2c743813f9670c481c58acaed
parent5cebdcd06b73ebf957d52b6a7a048937b146c9cd (diff)
downloadrockbox-508bf2b45a7bdd163c7bc7644900f2100f9fe137.tar.gz
rockbox-508bf2b45a7bdd163c7bc7644900f2100f9fe137.zip
Final removal of tabs in firmware path
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24158 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/common/dir_uncached.c2
-rw-r--r--firmware/common/memset16.c2
-rw-r--r--firmware/drivers/dac.h6
-rw-r--r--firmware/drivers/lcd-charset-player.c2
-rw-r--r--firmware/drivers/m66591.c8
-rw-r--r--firmware/drivers/rtc/rtc_m41st84w.c8
-rw-r--r--firmware/export/config/ipodnano1g.h2
-rw-r--r--firmware/export/debug.h4
8 files changed, 17 insertions, 17 deletions
diff --git a/firmware/common/dir_uncached.c b/firmware/common/dir_uncached.c
index 5ec5c7fb41..2052503c43 100644
--- a/firmware/common/dir_uncached.c
+++ b/firmware/common/dir_uncached.c
@@ -175,7 +175,7 @@ struct dirent_uncached* readdir_uncached(DIR_UNCACHED* dir)
175 return NULL; 175 return NULL;
176 176
177 if ( !entry.name[0] ) 177 if ( !entry.name[0] )
178 return NULL; 178 return NULL;
179 179
180 strlcpy(theent->d_name, entry.name, sizeof(theent->d_name)); 180 strlcpy(theent->d_name, entry.name, sizeof(theent->d_name));
181 theent->attribute = entry.attr; 181 theent->attribute = entry.attr;
diff --git a/firmware/common/memset16.c b/firmware/common/memset16.c
index d73fdd9701..c90e2d7340 100644
--- a/firmware/common/memset16.c
+++ b/firmware/common/memset16.c
@@ -52,7 +52,7 @@ void memset16(void *dst, int val, size_t len)
52 { 52 {
53 buffer = 0; 53 buffer = 0;
54 for (i = 0; i < LBLOCKSIZE; i++) 54 for (i = 0; i < LBLOCKSIZE; i++)
55 buffer = (buffer << 16) | val; 55 buffer = (buffer << 16) | val;
56 } 56 }
57 57
58 while (len >= LBLOCKSIZE*4) 58 while (len >= LBLOCKSIZE*4)
diff --git a/firmware/drivers/dac.h b/firmware/drivers/dac.h
index 0083fc5fac..121ce74e9d 100644
--- a/firmware/drivers/dac.h
+++ b/firmware/drivers/dac.h
@@ -26,12 +26,12 @@
26#ifdef HAVE_DAC3550A 26#ifdef HAVE_DAC3550A
27 27
28/* 28/*
29 DAC I2C defs 29 DAC I2C defs
30*/ 30*/
31#define DAC_ADR 0x9a 31#define DAC_ADR 0x9a
32#define DAC_DEV_WRITE (DAC_ADR | 0x00) 32#define DAC_DEV_WRITE (DAC_ADR | 0x00)
33 33
34#define DAC_REG_WRITE 0xc0 34#define DAC_REG_WRITE 0xc0
35 35
36/* registers..*/ 36/* registers..*/
37#define DAC_SR_REG 1 37#define DAC_SR_REG 1
diff --git a/firmware/drivers/lcd-charset-player.c b/firmware/drivers/lcd-charset-player.c
index 100510fa2b..ba6f67848b 100644
--- a/firmware/drivers/lcd-charset-player.c
+++ b/firmware/drivers/lcd-charset-player.c
@@ -733,7 +733,7 @@ const struct xchar_info xchar_info_oldlcd[] = {
733 733
734 { 0xa7, 0, 0, 0x63 }, /* § (paragraph sign) */ 734 { 0xa7, 0, 0, 0x63 }, /* § (paragraph sign) */
735 735
736 { 0xab, XF_LEFTDBLANGLEQUOT, 1, 0x40 }, /* « (left double-angle quotation mark) */ 736 { 0xab, XF_LEFTDBLANGLEQUOT, 1, 0x40 }, /* « (left double-angle quotation mark) */
737 737
738 { 0xad, 0, 0, 0x31 }, /* ­ (soft hyphen) */ 738 { 0xad, 0, 0, 0x31 }, /* ­ (soft hyphen) */
739 739
diff --git a/firmware/drivers/m66591.c b/firmware/drivers/m66591.c
index d86106988a..f71be3e766 100644
--- a/firmware/drivers/m66591.c
+++ b/firmware/drivers/m66591.c
@@ -555,9 +555,9 @@ void USB_DEVICE(void) {
555 case CTRL_WTDS: 555 case CTRL_WTDS:
556 case CTRL_WTND: 556 case CTRL_WTND:
557 /* If data is not valid stop */ 557 /* If data is not valid stop */
558 if(!(M66591_INTSTAT_MAIN & (1<<3)) ) { 558 if(!(M66591_INTSTAT_MAIN & (1<<3)) ) {
559 logf("mxx: CTRT interrupt but VALID is false"); 559 logf("mxx: CTRT interrupt but VALID is false");
560 break; 560 break;
561 } 561 }
562 control_received(); 562 control_received();
563 break; 563 break;
@@ -777,7 +777,7 @@ void usb_attach(void) {
777#endif 777#endif
778 778
779 /* Enable oscillation buffer XCKE */ 779 /* Enable oscillation buffer XCKE */
780 M66591_TRN_CTRL |= (1<<13); 780 M66591_TRN_CTRL |= (1<<13);
781 781
782 udelay(1500); 782 udelay(1500);
783 783
diff --git a/firmware/drivers/rtc/rtc_m41st84w.c b/firmware/drivers/rtc/rtc_m41st84w.c
index 951091c6f2..5374f66f24 100644
--- a/firmware/drivers/rtc/rtc_m41st84w.c
+++ b/firmware/drivers/rtc/rtc_m41st84w.c
@@ -26,8 +26,8 @@
26#include <stdbool.h> 26#include <stdbool.h>
27 27
28#define RTC_ADR 0xd0 28#define RTC_ADR 0xd0
29#define RTC_DEV_WRITE (RTC_ADR | 0x00) 29#define RTC_DEV_WRITE (RTC_ADR | 0x00)
30#define RTC_DEV_READ (RTC_ADR | 0x01) 30#define RTC_DEV_READ (RTC_ADR | 0x01)
31 31
32void rtc_init(void) 32void rtc_init(void)
33{ 33{
@@ -159,8 +159,8 @@ bool rtc_enable_alarm(bool enable)
159 { 159 {
160 data &= 0x5f; /* turn bit d7=AFE and d5=ABE off */ 160 data &= 0x5f; /* turn bit d7=AFE and d5=ABE off */
161 rtc_write(0x0a, data); 161 rtc_write(0x0a, data);
162 sleep(HZ / 10); 162 sleep(HZ / 10);
163 rtc_check_alarm_flag(); 163 rtc_check_alarm_flag();
164 data |= 0xa0; /* turn bit d7=AFE and d5=ABE on */ 164 data |= 0xa0; /* turn bit d7=AFE and d5=ABE on */
165 rtc_write(0x0a, data); 165 rtc_write(0x0a, data);
166 } 166 }
diff --git a/firmware/export/config/ipodnano1g.h b/firmware/export/config/ipodnano1g.h
index e1ec1afa86..5f63c269ed 100644
--- a/firmware/export/config/ipodnano1g.h
+++ b/firmware/export/config/ipodnano1g.h
@@ -119,7 +119,7 @@
119#define BATTERY_CAPACITY_DEFAULT 300 /* default battery capacity */ 119#define BATTERY_CAPACITY_DEFAULT 300 /* default battery capacity */
120#define BATTERY_CAPACITY_MIN 200 /* min. capacity selectable */ 120#define BATTERY_CAPACITY_MIN 200 /* min. capacity selectable */
121#define BATTERY_CAPACITY_MAX 600 /* max. capacity selectable */ 121#define BATTERY_CAPACITY_MAX 600 /* max. capacity selectable */
122#define BATTERY_CAPACITY_INC 20 /* capacity increment */ 122#define BATTERY_CAPACITY_INC 20 /* capacity increment */
123#define BATTERY_TYPES_COUNT 1 /* only one type */ 123#define BATTERY_TYPES_COUNT 1 /* only one type */
124 124
125/* Hardware controlled charging? FIXME */ 125/* Hardware controlled charging? FIXME */
diff --git a/firmware/export/debug.h b/firmware/export/debug.h
index f9f93fdcd9..314b495dd2 100644
--- a/firmware/export/debug.h
+++ b/firmware/export/debug.h
@@ -33,7 +33,7 @@ extern void ldebugf(const char* file, int line, const char *fmt, ...)
33 33
34/* */ 34/* */
35#if defined(SIMULATOR) && !defined(__PCTOOL__) 35#if defined(SIMULATOR) && !defined(__PCTOOL__)
36#define DEBUGF debugf 36#define DEBUGF debugf
37#define LDEBUGF(...) ldebugf(__FILE__, __LINE__, __VA_ARGS__) 37#define LDEBUGF(...) ldebugf(__FILE__, __LINE__, __VA_ARGS__)
38#else 38#else
39#if defined(DEBUG) 39#if defined(DEBUG)
@@ -42,7 +42,7 @@ extern void ldebugf(const char* file, int line, const char *fmt, ...)
42void breakpoint(void); 42void breakpoint(void);
43#endif 43#endif
44 44
45#define DEBUGF debugf 45#define DEBUGF debugf
46#define LDEBUGF debugf 46#define LDEBUGF debugf
47#else 47#else
48#define DEBUGF(...) 48#define DEBUGF(...)