summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Gjenero <dreamlayers@rockbox.org>2011-12-19 20:12:52 +0000
committerBoris Gjenero <dreamlayers@rockbox.org>2011-12-19 20:12:52 +0000
commitfdc29d0ea4fbdd2cc1509a53122be7ec85cdb432 (patch)
tree3855b7ea3a288059458b847b4bdfabd5c48ccce4
parent7d61376ef80bc6ac7a817201729ee1e612625ef6 (diff)
downloadrockbox-fdc29d0ea4fbdd2cc1509a53122be7ec85cdb432.tar.gz
rockbox-fdc29d0ea4fbdd2cc1509a53122be7ec85cdb432.zip
Add more INIT_ATTR and add config.h includes to header files with INIT_ATTR.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31370 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/buffering.h3
-rw-r--r--apps/codec_thread.h3
-rw-r--r--apps/filetypes.h3
-rw-r--r--apps/gui/statusbar.h1
-rw-r--r--apps/gui/wps.h1
-rw-r--r--apps/misc.h2
-rw-r--r--apps/playlist.h1
-rw-r--r--apps/radio/radio.h1
-rw-r--r--apps/recorder/pcm_record.h4
-rw-r--r--apps/settings.h2
-rw-r--r--apps/tagcache.h1
-rw-r--r--apps/tagtree.h1
-rw-r--r--apps/tree.h1
-rw-r--r--apps/voice_thread.h4
-rw-r--r--firmware/export/disk.h3
-rw-r--r--firmware/export/mmc.h1
-rw-r--r--firmware/export/nand.h1
-rw-r--r--firmware/export/pcm-internal.h2
-rw-r--r--firmware/export/pcm.h1
-rw-r--r--firmware/export/power.h2
-rw-r--r--firmware/export/ramdisk.h1
-rw-r--r--firmware/export/scroll_engine.h1
-rw-r--r--firmware/export/sd.h1
-rw-r--r--firmware/export/tuner.h1
-rw-r--r--firmware/export/usb.h3
-rw-r--r--firmware/include/core_alloc.h3
-rw-r--r--firmware/target/arm/as3525/ascodec-target.h1
27 files changed, 39 insertions, 10 deletions
diff --git a/apps/buffering.h b/apps/buffering.h
index ee3e7c9053..6d52794233 100644
--- a/apps/buffering.h
+++ b/apps/buffering.h
@@ -24,6 +24,7 @@
24 24
25#include <sys/types.h> 25#include <sys/types.h>
26#include <stdbool.h> 26#include <stdbool.h>
27#include "config.h"
27#include "appevents.h" 28#include "appevents.h"
28 29
29 30
@@ -47,7 +48,7 @@ enum data_type {
47 48
48 49
49/* Initialise the buffering subsystem */ 50/* Initialise the buffering subsystem */
50void buffering_init(void); 51void buffering_init(void) INIT_ATTR;
51 52
52/* Reset the buffering system */ 53/* Reset the buffering system */
53bool buffering_reset(char *buf, size_t buflen); 54bool buffering_reset(char *buf, size_t buflen);
diff --git a/apps/codec_thread.h b/apps/codec_thread.h
index 65f64c377e..c33284e141 100644
--- a/apps/codec_thread.h
+++ b/apps/codec_thread.h
@@ -23,12 +23,13 @@
23#define _CODEC_THREAD_H 23#define _CODEC_THREAD_H
24 24
25#include <stdbool.h> 25#include <stdbool.h>
26#include "config.h"
26 27
27/* codec identity */ 28/* codec identity */
28const char *get_codec_filename(int cod_spec); 29const char *get_codec_filename(int cod_spec);
29 30
30/* codec thread */ 31/* codec thread */
31void codec_thread_init(void); 32void codec_thread_init(void) INIT_ATTR;
32 33
33/* Audio MUST be stopped before requesting callback! */ 34/* Audio MUST be stopped before requesting callback! */
34void codec_thread_do_callback(void (*fn)(void), 35void codec_thread_do_callback(void (*fn)(void),
diff --git a/apps/filetypes.h b/apps/filetypes.h
index dd8993e262..8c9e9a5d93 100644
--- a/apps/filetypes.h
+++ b/apps/filetypes.h
@@ -22,6 +22,7 @@
22#define _FILEHANDLE_H_ 22#define _FILEHANDLE_H_
23 23
24#include <stdbool.h> 24#include <stdbool.h>
25#include "config.h"
25#include <tree.h> 26#include <tree.h>
26 27
27/* using attribute bits not used by FAT (FAT uses lower 7) */ 28/* using attribute bits not used by FAT (FAT uses lower 7) */
@@ -54,7 +55,7 @@ struct filetype {
54 enum themable_icons icon; 55 enum themable_icons icon;
55 int voiceclip; 56 int voiceclip;
56}; 57};
57void tree_get_filetypes(const struct filetype**, int*); 58void tree_get_filetypes(const struct filetype**, int*) INIT_ATTR;
58 59
59/* init the filetypes structs. 60/* init the filetypes structs.
60 uses audio buffer for storage, so call early in init... */ 61 uses audio buffer for storage, so call early in init... */
diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h
index 281cf3f5b9..7ad07d0c78 100644
--- a/apps/gui/statusbar.h
+++ b/apps/gui/statusbar.h
@@ -22,6 +22,7 @@
22#ifndef _GUI_STATUSBAR_H_ 22#ifndef _GUI_STATUSBAR_H_
23#define _GUI_STATUSBAR_H_ 23#define _GUI_STATUSBAR_H_
24 24
25#include "config.h"
25#include "status.h" 26#include "status.h"
26#include "screen_access.h" 27#include "screen_access.h"
27#include "events.h" 28#include "events.h"
diff --git a/apps/gui/wps.h b/apps/gui/wps.h
index f1ec74659f..a463b0e9bb 100644
--- a/apps/gui/wps.h
+++ b/apps/gui/wps.h
@@ -21,6 +21,7 @@
21#ifndef _WPS_H_ 21#ifndef _WPS_H_
22#define _WPS_H_ 22#define _WPS_H_
23#include <stdbool.h> 23#include <stdbool.h>
24#include "config.h"
24#include "screen_access.h" 25#include "screen_access.h"
25 26
26long gui_wps_show(void); 27long gui_wps_show(void);
diff --git a/apps/misc.h b/apps/misc.h
index 4647898889..6305bcad62 100644
--- a/apps/misc.h
+++ b/apps/misc.h
@@ -63,7 +63,7 @@ bool settings_parseline(char* line, char** name, char** value);
63long default_event_handler_ex(long event, void (*callback)(void *), void *parameter); 63long default_event_handler_ex(long event, void (*callback)(void *), void *parameter);
64long default_event_handler(long event); 64long default_event_handler(long event);
65bool list_stop_handler(void); 65bool list_stop_handler(void);
66void car_adapter_mode_init(void); 66void car_adapter_mode_init(void) INIT_ATTR;
67extern int show_logo(void); 67extern int show_logo(void);
68 68
69int open_utf8(const char* pathname, int flags); 69int open_utf8(const char* pathname, int flags);
diff --git a/apps/playlist.h b/apps/playlist.h
index 4722be11c0..d19d9a792a 100644
--- a/apps/playlist.h
+++ b/apps/playlist.h
@@ -23,6 +23,7 @@
23#define __PLAYLIST_H__ 23#define __PLAYLIST_H__
24 24
25#include <stdbool.h> 25#include <stdbool.h>
26#include "config.h"
26#include "file.h" 27#include "file.h"
27#include "kernel.h" 28#include "kernel.h"
28#include "metadata.h" 29#include "metadata.h"
diff --git a/apps/radio/radio.h b/apps/radio/radio.h
index d243cb67a5..8c4b394137 100644
--- a/apps/radio/radio.h
+++ b/apps/radio/radio.h
@@ -21,6 +21,7 @@
21#ifndef RADIO_H 21#ifndef RADIO_H
22#define RADIO_H 22#define RADIO_H
23 23
24#include "config.h"
24#ifndef FMRADIO_H 25#ifndef FMRADIO_H
25#include "fmradio.h" 26#include "fmradio.h"
26#endif 27#endif
diff --git a/apps/recorder/pcm_record.h b/apps/recorder/pcm_record.h
index 3d9bb4c379..1ac6faefb2 100644
--- a/apps/recorder/pcm_record.h
+++ b/apps/recorder/pcm_record.h
@@ -22,6 +22,8 @@
22#ifndef PCM_RECORD_H 22#ifndef PCM_RECORD_H
23#define PCM_RECORD_H 23#define PCM_RECORD_H
24 24
25#include "config.h"
26
25/** Warnings **/ 27/** Warnings **/
26/* pcm (dma) buffer has overflowed */ 28/* pcm (dma) buffer has overflowed */
27#define PCMREC_W_PCM_BUFFER_OVF 0x00000001 29#define PCMREC_W_PCM_BUFFER_OVF 0x00000001
@@ -49,7 +51,7 @@ void pcm_rec_error_clear(void);
49 results for consistency with the hardware codec version */ 51 results for consistency with the hardware codec version */
50unsigned long pcm_rec_status(void); 52unsigned long pcm_rec_status(void);
51unsigned long pcm_rec_get_warnings(void); 53unsigned long pcm_rec_get_warnings(void);
52void pcm_rec_init(void); 54void pcm_rec_init(void) INIT_ATTR;
53int pcm_rec_current_bitrate(void); 55int pcm_rec_current_bitrate(void);
54int pcm_rec_encoder_afmt(void); /* AFMT_* value, AFMT_UNKNOWN if none */ 56int pcm_rec_encoder_afmt(void); /* AFMT_* value, AFMT_UNKNOWN if none */
55int pcm_rec_rec_format(void); /* Format index or -1 otherwise */ 57int pcm_rec_rec_format(void); /* Format index or -1 otherwise */
diff --git a/apps/settings.h b/apps/settings.h
index 2524dcc909..7047b93709 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -193,7 +193,7 @@ enum { ALARM_START_WPS = 0,
193#define SETTINGS_RTC (BIT_N(0)) /* only the settings from the RTC nonvolatile RAM */ 193#define SETTINGS_RTC (BIT_N(0)) /* only the settings from the RTC nonvolatile RAM */
194#define SETTINGS_HD (BIT_N(1)) /* only the settings from the disk sector */ 194#define SETTINGS_HD (BIT_N(1)) /* only the settings from the disk sector */
195#define SETTINGS_ALL (SETTINGS_RTC|SETTINGS_HD) /* both */ 195#define SETTINGS_ALL (SETTINGS_RTC|SETTINGS_HD) /* both */
196void settings_load(int which); 196void settings_load(int which) INIT_ATTR;
197bool settings_load_config(const char* file, bool apply); 197bool settings_load_config(const char* file, bool apply);
198 198
199void status_save(void); 199void status_save(void);
diff --git a/apps/tagcache.h b/apps/tagcache.h
index 604e93bce9..44161cf22c 100644
--- a/apps/tagcache.h
+++ b/apps/tagcache.h
@@ -22,6 +22,7 @@
22#ifndef _TAGCACHE_H 22#ifndef _TAGCACHE_H
23#define _TAGCACHE_H 23#define _TAGCACHE_H
24 24
25#include "config.h"
25#include "system.h" 26#include "system.h"
26#include "metadata.h" 27#include "metadata.h"
27 28
diff --git a/apps/tagtree.h b/apps/tagtree.h
index 26952b40b7..8369020371 100644
--- a/apps/tagtree.h
+++ b/apps/tagtree.h
@@ -22,6 +22,7 @@
22#ifndef _TAGTREE_H 22#ifndef _TAGTREE_H
23#define _TAGTREE_H 23#define _TAGTREE_H
24 24
25#include "config.h"
25#include "tagcache.h" 26#include "tagcache.h"
26#include "tree.h" 27#include "tree.h"
27 28
diff --git a/apps/tree.h b/apps/tree.h
index d3a128b87a..70494f8a88 100644
--- a/apps/tree.h
+++ b/apps/tree.h
@@ -24,6 +24,7 @@
24#include <stdbool.h> 24#include <stdbool.h>
25#include <applimits.h> 25#include <applimits.h>
26#include <file.h> 26#include <file.h>
27#include "config.h"
27#include "icon.h" 28#include "icon.h"
28 29
29/* keep this struct compatible (total size and name member) 30/* keep this struct compatible (total size and name member)
diff --git a/apps/voice_thread.h b/apps/voice_thread.h
index 5f6547fb76..49b2f3f930 100644
--- a/apps/voice_thread.h
+++ b/apps/voice_thread.h
@@ -21,6 +21,8 @@
21#ifndef VOICE_THREAD_H 21#ifndef VOICE_THREAD_H
22#define VOICE_THREAD_H 22#define VOICE_THREAD_H
23 23
24#include "config.h"
25
24void mp3_play_data(const unsigned char* start, int size, 26void mp3_play_data(const unsigned char* start, int size,
25 void (*get_more)(unsigned char** start, size_t* size)); 27 void (*get_more)(unsigned char** start, size_t* size));
26void mp3_play_stop(void); 28void mp3_play_stop(void);
@@ -30,7 +32,7 @@ bool mp3_is_playing(void);
30void voice_wait(void); 32void voice_wait(void);
31void voice_stop(void); 33void voice_stop(void);
32 34
33void voice_thread_init(void); 35void voice_thread_init(void) INIT_ATTR;
34#ifdef HAVE_PRIORITY_SCHEDULING 36#ifdef HAVE_PRIORITY_SCHEDULING
35void voice_thread_set_priority(int priority); 37void voice_thread_set_priority(int priority);
36#endif 38#endif
diff --git a/firmware/export/disk.h b/firmware/export/disk.h
index ece0e2644f..8d6b41b5bd 100644
--- a/firmware/export/disk.h
+++ b/firmware/export/disk.h
@@ -21,6 +21,7 @@
21#ifndef _DISK_H_ 21#ifndef _DISK_H_
22#define _DISK_H_ 22#define _DISK_H_
23 23
24#include "config.h"
24#include "mv.h" /* for volume definitions */ 25#include "mv.h" /* for volume definitions */
25 26
26struct partinfo { 27struct partinfo {
@@ -38,7 +39,7 @@ struct partinfo {
38struct partinfo* disk_init(IF_MD_NONVOID(int drive)); 39struct partinfo* disk_init(IF_MD_NONVOID(int drive));
39struct partinfo* disk_partinfo(int partition); 40struct partinfo* disk_partinfo(int partition);
40 41
41void disk_init_subsystem(void); /* Initialises mutexes */ 42void disk_init_subsystem(void) INIT_ATTR; /* Initialises mutexes */
42int disk_mount_all(void); /* returns the # of successful mounts */ 43int disk_mount_all(void); /* returns the # of successful mounts */
43int disk_mount(int drive); 44int disk_mount(int drive);
44int disk_unmount_all(void); 45int disk_unmount_all(void);
diff --git a/firmware/export/mmc.h b/firmware/export/mmc.h
index 7e72cb0846..4c7e9c0926 100644
--- a/firmware/export/mmc.h
+++ b/firmware/export/mmc.h
@@ -23,6 +23,7 @@
23#define __MMC_H__ 23#define __MMC_H__
24 24
25#include <stdbool.h> 25#include <stdbool.h>
26#include "config.h"
26#include "mv.h" /* for HAVE_MULTIDRIVE or not */ 27#include "mv.h" /* for HAVE_MULTIDRIVE or not */
27 28
28struct storage_info; 29struct storage_info;
diff --git a/firmware/export/nand.h b/firmware/export/nand.h
index 13d559486c..58751ab298 100644
--- a/firmware/export/nand.h
+++ b/firmware/export/nand.h
@@ -23,6 +23,7 @@
23#define __NAND_H__ 23#define __NAND_H__
24 24
25#include <stdbool.h> 25#include <stdbool.h>
26#include "config.h"
26#include "mv.h" /* for HAVE_MULTIDRIVE or not */ 27#include "mv.h" /* for HAVE_MULTIDRIVE or not */
27 28
28struct storage_info; 29struct storage_info;
diff --git a/firmware/export/pcm-internal.h b/firmware/export/pcm-internal.h
index d881963ebd..89d895fe4b 100644
--- a/firmware/export/pcm-internal.h
+++ b/firmware/export/pcm-internal.h
@@ -22,6 +22,8 @@
22#ifndef PCM_INTERNAL_H 22#ifndef PCM_INTERNAL_H
23#define PCM_INTERNAL_H 23#define PCM_INTERNAL_H
24 24
25#include "config.h"
26
25/* Cheapo buffer align macro to align to the 16-16 PCM size */ 27/* Cheapo buffer align macro to align to the 16-16 PCM size */
26#define ALIGN_AUDIOBUF(start, size) \ 28#define ALIGN_AUDIOBUF(start, size) \
27 ({ (start) = (void *)(((uintptr_t)(start) + 3) & ~3); \ 29 ({ (start) = (void *)(((uintptr_t)(start) + 3) & ~3); \
diff --git a/firmware/export/pcm.h b/firmware/export/pcm.h
index 40d5afc0ba..4a7a5b3193 100644
--- a/firmware/export/pcm.h
+++ b/firmware/export/pcm.h
@@ -22,6 +22,7 @@
22#define PCM_PLAYBACK_H 22#define PCM_PLAYBACK_H
23 23
24#include <string.h> /* size_t */ 24#include <string.h> /* size_t */
25#include "config.h"
25 26
26#define DMA_REC_ERROR_DMA (-1) 27#define DMA_REC_ERROR_DMA (-1)
27#ifdef HAVE_SPDIF_REC 28#ifdef HAVE_SPDIF_REC
diff --git a/firmware/export/power.h b/firmware/export/power.h
index 137f40cb01..d46b9ba924 100644
--- a/firmware/export/power.h
+++ b/firmware/export/power.h
@@ -21,6 +21,8 @@
21#ifndef _POWER_H_ 21#ifndef _POWER_H_
22#define _POWER_H_ 22#define _POWER_H_
23 23
24#include "config.h"
25
24#if CONFIG_CHARGING 26#if CONFIG_CHARGING
25enum power_input_flags { 27enum power_input_flags {
26 /* No external power source? Default. */ 28 /* No external power source? Default. */
diff --git a/firmware/export/ramdisk.h b/firmware/export/ramdisk.h
index 5135e38301..c478c78882 100644
--- a/firmware/export/ramdisk.h
+++ b/firmware/export/ramdisk.h
@@ -23,6 +23,7 @@
23#define __RAMDISK_H__ 23#define __RAMDISK_H__
24 24
25#include <stdbool.h> 25#include <stdbool.h>
26#include "config.h"
26#include "mv.h" /* for HAVE_MULTIDRIVE or not */ 27#include "mv.h" /* for HAVE_MULTIDRIVE or not */
27 28
28struct storage_info; 29struct storage_info;
diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h
index 0fe6fe464a..55f4120893 100644
--- a/firmware/export/scroll_engine.h
+++ b/firmware/export/scroll_engine.h
@@ -25,6 +25,7 @@
25#ifndef __SCROLL_ENGINE_H__ 25#ifndef __SCROLL_ENGINE_H__
26#define __SCROLL_ENGINE_H__ 26#define __SCROLL_ENGINE_H__
27 27
28#include "config.h"
28#include <lcd.h> 29#include <lcd.h>
29#include "file.h" 30#include "file.h"
30 31
diff --git a/firmware/export/sd.h b/firmware/export/sd.h
index 43c961efb3..1c3c429508 100644
--- a/firmware/export/sd.h
+++ b/firmware/export/sd.h
@@ -23,6 +23,7 @@
23#define __SD_H__ 23#define __SD_H__
24 24
25#include <stdbool.h> 25#include <stdbool.h>
26#include "config.h"
26#include "mv.h" /* for HAVE_MULTIDRIVE or not */ 27#include "mv.h" /* for HAVE_MULTIDRIVE or not */
27 28
28#ifdef HAVE_BOOTLOADER_USB_MODE 29#ifdef HAVE_BOOTLOADER_USB_MODE
diff --git a/firmware/export/tuner.h b/firmware/export/tuner.h
index 6fedc0f785..694da7cc6c 100644
--- a/firmware/export/tuner.h
+++ b/firmware/export/tuner.h
@@ -22,6 +22,7 @@
22#ifndef __TUNER_H__ 22#ifndef __TUNER_H__
23#define __TUNER_H__ 23#define __TUNER_H__
24 24
25#include "config.h"
25#include "hwcompat.h" 26#include "hwcompat.h"
26 27
27/** Settings to the tuner layer **/ 28/** Settings to the tuner layer **/
diff --git a/firmware/export/usb.h b/firmware/export/usb.h
index 3baacc5420..ae6d59b497 100644
--- a/firmware/export/usb.h
+++ b/firmware/export/usb.h
@@ -21,6 +21,7 @@
21#ifndef _USB_H_ 21#ifndef _USB_H_
22#define _USB_H_ 22#define _USB_H_
23 23
24#include "config.h"
24#include "kernel.h" 25#include "kernel.h"
25#include "button.h" 26#include "button.h"
26 27
@@ -103,7 +104,7 @@ struct usb_transfer_completion_event_data
103void usb_init(void) INIT_ATTR; 104void usb_init(void) INIT_ATTR;
104void usb_enable(bool on); 105void usb_enable(bool on);
105void usb_attach(void); 106void usb_attach(void);
106void usb_start_monitoring(void); 107void usb_start_monitoring(void) INIT_ATTR;
107void usb_close(void); 108void usb_close(void);
108void usb_acknowledge(long id); 109void usb_acknowledge(long id);
109void usb_wait_for_disconnect(struct event_queue *q); 110void usb_wait_for_disconnect(struct event_queue *q);
diff --git a/firmware/include/core_alloc.h b/firmware/include/core_alloc.h
index 0ac7e5b73d..d234947db1 100644
--- a/firmware/include/core_alloc.h
+++ b/firmware/include/core_alloc.h
@@ -3,12 +3,13 @@
3#define __CORE_ALLOC_H__ 3#define __CORE_ALLOC_H__
4#include <string.h> 4#include <string.h>
5#include <stdbool.h> 5#include <stdbool.h>
6#include "config.h"
6#include "buflib.h" 7#include "buflib.h"
7 8
8/* All functions below are wrappers for functions in buflib.h, except 9/* All functions below are wrappers for functions in buflib.h, except
9 * they have a predefined context 10 * they have a predefined context
10 */ 11 */
11void core_allocator_init(void); 12void core_allocator_init(void) INIT_ATTR;
12int core_alloc(const char* name, size_t size); 13int core_alloc(const char* name, size_t size);
13int core_alloc_ex(const char* name, size_t size, struct buflib_callbacks *ops); 14int core_alloc_ex(const char* name, size_t size, struct buflib_callbacks *ops);
14int core_alloc_maximum(const char* name, size_t *size, struct buflib_callbacks *ops); 15int core_alloc_maximum(const char* name, size_t *size, struct buflib_callbacks *ops);
diff --git a/firmware/target/arm/as3525/ascodec-target.h b/firmware/target/arm/as3525/ascodec-target.h
index 7e1a3b7424..ece8c21dd0 100644
--- a/firmware/target/arm/as3525/ascodec-target.h
+++ b/firmware/target/arm/as3525/ascodec-target.h
@@ -27,6 +27,7 @@
27 27
28#ifndef SIMULATOR 28#ifndef SIMULATOR
29 29
30#include "config.h"
30#include "as3514.h" 31#include "as3514.h"
31#include "kernel.h" /* for struct semaphore */ 32#include "kernel.h" /* for struct semaphore */
32#include "clock-target.h" /* for AS3525_I2C_PRESCALER */ 33#include "clock-target.h" /* for AS3525_I2C_PRESCALER */