summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2010-01-03 11:12:31 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2010-01-03 11:12:31 +0000
commit5cebdcd06b73ebf957d52b6a7a048937b146c9cd (patch)
treeadd76f949383e761edb4ba41880a7c6cae73ba08
parent05778b501d7dfa0d6e55d779a577db9581774e2d (diff)
downloadrockbox-5cebdcd06b73ebf957d52b6a7a048937b146c9cd.tar.gz
rockbox-5cebdcd06b73ebf957d52b6a7a048937b146c9cd.zip
More tabs removed
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24157 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/lib/codeclib.h2
-rw-r--r--apps/plugins/beatbox/beatbox.c4
-rw-r--r--apps/plugins/goban/goban.h16
-rw-r--r--bootloader/ondavx747.c12
-rw-r--r--uisimulator/common/sim_icons.c2
5 files changed, 18 insertions, 18 deletions
diff --git a/apps/codecs/lib/codeclib.h b/apps/codecs/lib/codeclib.h
index aeae5d6369..517264f3a5 100644
--- a/apps/codecs/lib/codeclib.h
+++ b/apps/codecs/lib/codeclib.h
@@ -97,7 +97,7 @@ static inline unsigned int bs_generic(unsigned int v, int mode)
97 r &= 31; 97 r &= 31;
98 } else { 98 } else {
99 r = 31 - r; 99 r = 31 - r;
100 /* If mode is constant, this is a single conditional instruction */ 100 /* If mode is constant, this is a single conditional instruction */
101 if (mode & BS_0_0 && (signed)r < 0) 101 if (mode & BS_0_0 && (signed)r < 0)
102 r += 1; 102 r += 1;
103 } 103 }
diff --git a/apps/plugins/beatbox/beatbox.c b/apps/plugins/beatbox/beatbox.c
index 0974dc3d05..b8e46bcd0c 100644
--- a/apps/plugins/beatbox/beatbox.c
+++ b/apps/plugins/beatbox/beatbox.c
@@ -106,7 +106,7 @@ PLUGIN_IRAM_DECLARE
106#define MAX_VOICES 20 // Note: 24 midi channels is the minimum general midi 106#define MAX_VOICES 20 // Note: 24 midi channels is the minimum general midi
107 // spec implementation 107 // spec implementation
108 108
109#else // Simulator requires 44100, and we can afford to use more voices 109#else // Simulator requires 44100, and we can afford to use more voices
110 110
111#define SAMPLE_RATE SAMPR_44 111#define SAMPLE_RATE SAMPR_44
112#define MAX_VOICES 48 112#define MAX_VOICES 48
@@ -120,7 +120,7 @@ PLUGIN_IRAM_DECLARE
120#undef SYNC 120#undef SYNC
121 121
122#ifdef SIMULATOR 122#ifdef SIMULATOR
123 #define SYNC 123 #define SYNC
124#endif 124#endif
125 125
126struct MIDIfile * mf IBSS_ATTR; 126struct MIDIfile * mf IBSS_ATTR;
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h
index e30e14bfe3..b7c083ed0d 100644
--- a/apps/plugins/goban/goban.h
+++ b/apps/plugins/goban/goban.h
@@ -42,13 +42,13 @@
42#define CURSOR_COLOR LCD_RGBPACK(222,0,0) 42#define CURSOR_COLOR LCD_RGBPACK(222,0,0)
43#define MARK_COLOR LCD_RGBPACK(0,0,255) 43#define MARK_COLOR LCD_RGBPACK(0,0,255)
44#elif LCD_DEPTH > 1 /* grayscale */ 44#elif LCD_DEPTH > 1 /* grayscale */
45#define BOARD_COLOR LCD_LIGHTGRAY 45#define BOARD_COLOR LCD_LIGHTGRAY
46#define WHITE_COLOR LCD_WHITE 46#define WHITE_COLOR LCD_WHITE
47#define BLACK_COLOR LCD_BLACK 47#define BLACK_COLOR LCD_BLACK
48#define LINE_COLOR LCD_BLACK 48#define LINE_COLOR LCD_BLACK
49#define BACKGROUND_COLOR LCD_DARKGRAY 49#define BACKGROUND_COLOR LCD_DARKGRAY
50#define CURSOR_COLOR LCD_DARKGRAY 50#define CURSOR_COLOR LCD_DARKGRAY
51#define MARK_COLOR LCD_DARKGRAY 51#define MARK_COLOR LCD_DARKGRAY
52#endif 52#endif
53 53
54/* Key setups */ 54/* Key setups */
@@ -200,7 +200,7 @@
200#define GBN_BUTTON_NEXT_VAR BUTTON_PLAY 200#define GBN_BUTTON_NEXT_VAR BUTTON_PLAY
201 201
202#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) 202#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
203#define GBN_BUTTON_UP BUTTON_SCROLL_UP 203#define GBN_BUTTON_UP BUTTON_SCROLL_UP
204#define GBN_BUTTON_DOWN BUTTON_SCROLL_DOWN 204#define GBN_BUTTON_DOWN BUTTON_SCROLL_DOWN
205#define GBN_BUTTON_LEFT BUTTON_LEFT 205#define GBN_BUTTON_LEFT BUTTON_LEFT
206#define GBN_BUTTON_RIGHT BUTTON_RIGHT 206#define GBN_BUTTON_RIGHT BUTTON_RIGHT
diff --git a/bootloader/ondavx747.c b/bootloader/ondavx747.c
index 20f47d5224..994f45d78d 100644
--- a/bootloader/ondavx747.c
+++ b/bootloader/ondavx747.c
@@ -243,12 +243,12 @@ redraw:
243 goto redraw; 243 goto redraw;
244 } 244 }
245 else if(button & BUTTON_POWER) 245 else if(button & BUTTON_POWER)
246 { 246 {
247 if(poweroff_repeat++ > 8) 247 if(poweroff_repeat++ > 8)
248 power_off(); 248 power_off();
249 } 249 }
250 else 250 else
251 poweroff_repeat = 0; 251 poweroff_repeat = 0;
252 } 252 }
253} 253}
254 254
diff --git a/uisimulator/common/sim_icons.c b/uisimulator/common/sim_icons.c
index 445a685648..cfba2b7aa3 100644
--- a/uisimulator/common/sim_icons.c
+++ b/uisimulator/common/sim_icons.c
@@ -308,7 +308,7 @@ void
308lcd_icon(int icon, bool enable) 308lcd_icon(int icon, bool enable)
309{ 309{
310 lcd_print_icon(icons[icon].xpos, icons[icon].row, enable, 310 lcd_print_icon(icons[icon].xpos, icons[icon].row, enable,
311 icons[icon].bitmap); 311 icons[icon].bitmap);
312} 312}
313 313
314#endif /* HAVE_LCD_CHARCELLS */ 314#endif /* HAVE_LCD_CHARCELLS */