summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorThomas Jarosch <tomj@simonv.com>2015-01-11 21:40:51 +0100
committerThomas Jarosch <tomj@simonv.com>2015-01-11 21:40:51 +0100
commit2a3e1628a50b9de7c1462ee95eb79937795f5409 (patch)
tree3c2c965007a71c4895a65d8a91252b9ce2255719 /firmware
parent85c98bc63c6635fe9e337178f23faa9c0ec3f9fb (diff)
downloadrockbox-2a3e1628a50b9de7c1462ee95eb79937795f5409.tar.gz
rockbox-2a3e1628a50b9de7c1462ee95eb79937795f5409.zip
Limit more variables to file scope
Change-Id: I30219d626316776eb73b4205d63376fa3dbc6361
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/ata_flash.c2
-rw-r--r--firmware/drivers/lcd-charset-player.c4
-rw-r--r--firmware/test/buflib/test_main2.c4
-rw-r--r--firmware/test/buflib/test_move2.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/firmware/drivers/ata_flash.c b/firmware/drivers/ata_flash.c
index 96ea1cfa68..fbdd7f04ee 100644
--- a/firmware/drivers/ata_flash.c
+++ b/firmware/drivers/ata_flash.c
@@ -42,7 +42,7 @@
42 42
43#define SECTOR_SIZE (512) 43#define SECTOR_SIZE (512)
44 44
45long last_disk_activity = -1; 45static long last_disk_activity = -1;
46 46
47#if CONFIG_FLASH == FLASH_IFP7XX 47#if CONFIG_FLASH == FLASH_IFP7XX
48static unsigned char flash_ce[4] = {0x20, 0x02, 0x10, 0x08}; 48static unsigned char flash_ce[4] = {0x20, 0x02, 0x10, 0x08};
diff --git a/firmware/drivers/lcd-charset-player.c b/firmware/drivers/lcd-charset-player.c
index 68404c6230..b1f6f6dae2 100644
--- a/firmware/drivers/lcd-charset-player.c
+++ b/firmware/drivers/lcd-charset-player.c
@@ -115,7 +115,7 @@ enum {
115#endif 115#endif
116}; 116};
117 117
118const struct xchar_info xchar_info_newlcd[] = { 118static const struct xchar_info xchar_info_newlcd[] = {
119 /* Standard ascii */ 119 /* Standard ascii */
120 { 0x20, 0, 0, 0x20 }, /* */ 120 { 0x20, 0, 0, 0x20 }, /* */
121 { 0x21, 0, 0, 0x21 }, /* ! */ 121 { 0x21, 0, 0, 0x21 }, /* ! */
@@ -641,7 +641,7 @@ const struct xchar_info xchar_info_newlcd[] = {
641 { 0xfffd, 0, 0, 0x91 }, 641 { 0xfffd, 0, 0, 0x91 },
642}; 642};
643 643
644const struct xchar_info xchar_info_oldlcd[] = { 644static const struct xchar_info xchar_info_oldlcd[] = {
645 /* Standard ascii */ 645 /* Standard ascii */
646 { 0x20, 0, 0, 0x24 }, /* */ 646 { 0x20, 0, 0, 0x24 }, /* */
647 { 0x21, 0, 0, 0x25 }, /* ! */ 647 { 0x21, 0, 0, 0x25 }, /* ! */
diff --git a/firmware/test/buflib/test_main2.c b/firmware/test/buflib/test_main2.c
index 9fed78612e..da6b1366e7 100644
--- a/firmware/test/buflib/test_main2.c
+++ b/firmware/test/buflib/test_main2.c
@@ -52,12 +52,12 @@ static int shrink_callback(int handle, unsigned hints, void* start, size_t size)
52 return BUFLIB_CB_CANNOT_SHRINK; 52 return BUFLIB_CB_CANNOT_SHRINK;
53} 53}
54 54
55struct buflib_callbacks ops = { 55static struct buflib_callbacks ops = {
56 .move_callback = move_callback, 56 .move_callback = move_callback,
57 .shrink_callback = shrink_callback, 57 .shrink_callback = shrink_callback,
58}; 58};
59 59
60struct buflib_callbacks ops2 = { 60static struct buflib_callbacks ops2 = {
61 .move_callback = NULL, 61 .move_callback = NULL,
62 .shrink_callback = shrink_callback, 62 .shrink_callback = shrink_callback,
63}; 63};
diff --git a/firmware/test/buflib/test_move2.c b/firmware/test/buflib/test_move2.c
index 1076c27a50..2f72850b2b 100644
--- a/firmware/test/buflib/test_move2.c
+++ b/firmware/test/buflib/test_move2.c
@@ -80,7 +80,7 @@ struct buflib_callbacks ops = {
80 .shrink_callback = NULL, 80 .shrink_callback = NULL,
81}; 81};
82 82
83struct buflib_callbacks ops_no_move = { 83static struct buflib_callbacks ops_no_move = {
84 .move_callback = NULL, 84 .move_callback = NULL,
85 .shrink_callback = NULL, 85 .shrink_callback = NULL,
86}; 86};