diff options
-rw-r--r-- | firmware/drivers/audio/wm8731.c | 2 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8751.c | 2 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8985.c | 2 | ||||
-rw-r--r-- | firmware/load_code.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/i2c-telechips.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/philips/hdd6330/button-hdd6330.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/pp/ata-pp5020.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/pp/system-target.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/tcc780x/debug-tcc780x.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/tcc780x/system-target.h | 1 | ||||
-rw-r--r-- | lib/rbcodec/test/warble.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/test/warble.make | 4 | ||||
-rw-r--r-- | tools/checkwps/checkwps.make | 1 | ||||
-rw-r--r-- | tools/database/database.make | 1 |
15 files changed, 20 insertions, 4 deletions
diff --git a/firmware/drivers/audio/wm8731.c b/firmware/drivers/audio/wm8731.c index 5c1e623a35..18e04618bf 100644 --- a/firmware/drivers/audio/wm8731.c +++ b/firmware/drivers/audio/wm8731.c | |||
@@ -25,9 +25,11 @@ | |||
25 | * KIND, either express or implied. | 25 | * KIND, either express or implied. |
26 | * | 26 | * |
27 | ****************************************************************************/ | 27 | ****************************************************************************/ |
28 | |||
28 | #include "config.h" | 29 | #include "config.h" |
29 | #include "logf.h" | 30 | #include "logf.h" |
30 | #include "system.h" | 31 | #include "system.h" |
32 | #include "kernel.h" | ||
31 | #include "string.h" | 33 | #include "string.h" |
32 | 34 | ||
33 | #include "pcm_sampr.h" | 35 | #include "pcm_sampr.h" |
diff --git a/firmware/drivers/audio/wm8751.c b/firmware/drivers/audio/wm8751.c index 992c932179..7b6a2712e5 100644 --- a/firmware/drivers/audio/wm8751.c +++ b/firmware/drivers/audio/wm8751.c | |||
@@ -25,6 +25,8 @@ | |||
25 | * KIND, either express or implied. | 25 | * KIND, either express or implied. |
26 | * | 26 | * |
27 | ****************************************************************************/ | 27 | ****************************************************************************/ |
28 | |||
29 | #include "config.h" | ||
28 | #include "kernel.h" | 30 | #include "kernel.h" |
29 | #include "wmcodec.h" | 31 | #include "wmcodec.h" |
30 | #include "audio.h" | 32 | #include "audio.h" |
diff --git a/firmware/drivers/audio/wm8985.c b/firmware/drivers/audio/wm8985.c index fab7354685..21b2463272 100644 --- a/firmware/drivers/audio/wm8985.c +++ b/firmware/drivers/audio/wm8985.c | |||
@@ -16,8 +16,10 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | |||
19 | #include "logf.h" | 20 | #include "logf.h" |
20 | #include "system.h" | 21 | #include "system.h" |
22 | #include "kernel.h" | ||
21 | #include "string.h" | 23 | #include "string.h" |
22 | #include "audio.h" | 24 | #include "audio.h" |
23 | 25 | ||
diff --git a/firmware/load_code.c b/firmware/load_code.c index d22d6bb3b2..6670a30c96 100644 --- a/firmware/load_code.c +++ b/firmware/load_code.c | |||
@@ -21,6 +21,7 @@ | |||
21 | 21 | ||
22 | #include "config.h" | 22 | #include "config.h" |
23 | #include "system.h" | 23 | #include "system.h" |
24 | #include "kernel.h" | ||
24 | #include "file.h" | 25 | #include "file.h" |
25 | #include "debug.h" | 26 | #include "debug.h" |
26 | #include "load_code.h" | 27 | #include "load_code.h" |
diff --git a/firmware/target/arm/i2c-telechips.c b/firmware/target/arm/i2c-telechips.c index 511bbe8865..84381ddbf0 100644 --- a/firmware/target/arm/i2c-telechips.c +++ b/firmware/target/arm/i2c-telechips.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include "config.h" | 21 | #include "config.h" |
22 | 22 | ||
23 | #include "system.h" | 23 | #include "system.h" |
24 | #include "kernel.h" | ||
24 | #include "i2c.h" | 25 | #include "i2c.h" |
25 | #include "i2c-target.h" | 26 | #include "i2c-target.h" |
26 | 27 | ||
diff --git a/firmware/target/arm/philips/hdd6330/button-hdd6330.c b/firmware/target/arm/philips/hdd6330/button-hdd6330.c index 75e14e375f..3f662cca4f 100644 --- a/firmware/target/arm/philips/hdd6330/button-hdd6330.c +++ b/firmware/target/arm/philips/hdd6330/button-hdd6330.c | |||
@@ -19,7 +19,9 @@ | |||
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | #include "config.h" | ||
22 | #include "system.h" | 23 | #include "system.h" |
24 | #include "kernel.h" | ||
23 | #include "button.h" | 25 | #include "button.h" |
24 | #include "backlight.h" | 26 | #include "backlight.h" |
25 | #include "powermgmt.h" | 27 | #include "powermgmt.h" |
diff --git a/firmware/target/arm/pp/ata-pp5020.c b/firmware/target/arm/pp/ata-pp5020.c index 1fc302a60d..9b3158ecc7 100644 --- a/firmware/target/arm/pp/ata-pp5020.c +++ b/firmware/target/arm/pp/ata-pp5020.c | |||
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | #include <stdbool.h> | 24 | #include <stdbool.h> |
25 | #include "system.h" | 25 | #include "system.h" |
26 | #include "kernel.h" | ||
26 | #include "ata-driver.h" | 27 | #include "ata-driver.h" |
27 | 28 | ||
28 | void ata_reset() | 29 | void ata_reset() |
diff --git a/firmware/target/arm/pp/system-target.h b/firmware/target/arm/pp/system-target.h index 742044b7be..d372b65502 100644 --- a/firmware/target/arm/pp/system-target.h +++ b/firmware/target/arm/pp/system-target.h | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <stdbool.h> | 25 | #include <stdbool.h> |
26 | #include "config.h" | 26 | #include "config.h" |
27 | #include "system-arm.h" | 27 | #include "system-arm.h" |
28 | #include "kernel.h" | ||
29 | 28 | ||
30 | /* TODO: This header could be split in 2 */ | 29 | /* TODO: This header could be split in 2 */ |
31 | 30 | ||
diff --git a/firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c b/firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c index 4e6d9718a5..5f1cfc6455 100644 --- a/firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c +++ b/firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c | |||
@@ -20,6 +20,8 @@ | |||
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | #include "config.h" | 22 | #include "config.h" |
23 | #include "system.h" | ||
24 | #include "kernel.h" | ||
23 | #include "button.h" | 25 | #include "button.h" |
24 | #include "pcf50606.h" | 26 | #include "pcf50606.h" |
25 | #include "touchscreen.h" | 27 | #include "touchscreen.h" |
diff --git a/firmware/target/arm/tcc780x/debug-tcc780x.c b/firmware/target/arm/tcc780x/debug-tcc780x.c index 658995a2de..fc03871c9c 100644 --- a/firmware/target/arm/tcc780x/debug-tcc780x.c +++ b/firmware/target/arm/tcc780x/debug-tcc780x.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include "config.h" | 24 | #include "config.h" |
25 | #include "cpu.h" | 25 | #include "cpu.h" |
26 | #include "system.h" | 26 | #include "system.h" |
27 | #include "kernel.h" | ||
27 | #include "string.h" | 28 | #include "string.h" |
28 | #include "button.h" | 29 | #include "button.h" |
29 | #include "lcd.h" | 30 | #include "lcd.h" |
diff --git a/firmware/target/arm/tcc780x/system-target.h b/firmware/target/arm/tcc780x/system-target.h index a369c2fb9a..fe66a6eb68 100644 --- a/firmware/target/arm/tcc780x/system-target.h +++ b/firmware/target/arm/tcc780x/system-target.h | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | #include "system-arm.h" | 24 | #include "system-arm.h" |
25 | #include "mmu-arm.h" | 25 | #include "mmu-arm.h" |
26 | #include "kernel.h" /* TIME_BEFORE */ | ||
27 | 26 | ||
28 | #define CPUFREQ_DEFAULT 32000000 | 27 | #define CPUFREQ_DEFAULT 32000000 |
29 | #define CPUFREQ_NORMAL 48000000 | 28 | #define CPUFREQ_NORMAL 48000000 |
diff --git a/lib/rbcodec/test/warble.c b/lib/rbcodec/test/warble.c index 336438374c..cbecc305bf 100644 --- a/lib/rbcodec/test/warble.c +++ b/lib/rbcodec/test/warble.c | |||
@@ -32,13 +32,13 @@ | |||
32 | #include <sys/stat.h> | 32 | #include <sys/stat.h> |
33 | #include <unistd.h> | 33 | #include <unistd.h> |
34 | #include "buffering.h" /* TYPE_PACKET_AUDIO */ | 34 | #include "buffering.h" /* TYPE_PACKET_AUDIO */ |
35 | #include "kernel.h" | ||
35 | #include "codecs.h" | 36 | #include "codecs.h" |
36 | #include "dsp_core.h" | 37 | #include "dsp_core.h" |
37 | #include "metadata.h" | 38 | #include "metadata.h" |
38 | #include "settings.h" | 39 | #include "settings.h" |
39 | #include "sound.h" | 40 | #include "sound.h" |
40 | #include "tdspeed.h" | 41 | #include "tdspeed.h" |
41 | #include "kernel.h" | ||
42 | #include "platform.h" | 42 | #include "platform.h" |
43 | 43 | ||
44 | /***************** EXPORTED *****************/ | 44 | /***************** EXPORTED *****************/ |
diff --git a/lib/rbcodec/test/warble.make b/lib/rbcodec/test/warble.make index b238a2ed63..108b539931 100644 --- a/lib/rbcodec/test/warble.make +++ b/lib/rbcodec/test/warble.make | |||
@@ -18,7 +18,9 @@ SRC= $(call preprocess, $(ROOTDIR)/lib/rbcodec/test/SOURCES) | |||
18 | 18 | ||
19 | INCLUDES += -I$(ROOTDIR)/lib/rbcodec/test \ | 19 | INCLUDES += -I$(ROOTDIR)/lib/rbcodec/test \ |
20 | -I$(ROOTDIR)/apps -I$(ROOTDIR)/apps/gui \ | 20 | -I$(ROOTDIR)/apps -I$(ROOTDIR)/apps/gui \ |
21 | -I$(ROOTDIR)/firmware/export -I$(ROOTDIR)/firmware/include \ | 21 | -I$(FIRMDIR)/kernel/include \ |
22 | -I$(ROOTDIR)/firmware/export \ | ||
23 | -I$(ROOTDIR)/firmware/include \ | ||
22 | -I$(ROOTDIR)/firmware/target/hosted \ | 24 | -I$(ROOTDIR)/firmware/target/hosted \ |
23 | -I$(ROOTDIR)/firmware/target/hosted/sdl | 25 | -I$(ROOTDIR)/firmware/target/hosted/sdl |
24 | 26 | ||
diff --git a/tools/checkwps/checkwps.make b/tools/checkwps/checkwps.make index fd8f1e81ff..2ae15903a7 100644 --- a/tools/checkwps/checkwps.make +++ b/tools/checkwps/checkwps.make | |||
@@ -16,6 +16,7 @@ OTHER_SRC += $(CHECKWPS_SRC) | |||
16 | 16 | ||
17 | INCLUDES = -I$(ROOTDIR)/apps/gui \ | 17 | INCLUDES = -I$(ROOTDIR)/apps/gui \ |
18 | -I$(ROOTDIR)/apps/gui/skin_engine \ | 18 | -I$(ROOTDIR)/apps/gui/skin_engine \ |
19 | -I$(FIRMDIR)/kernel/include \ | ||
19 | -I$(ROOTDIR)/firmware/export \ | 20 | -I$(ROOTDIR)/firmware/export \ |
20 | -I$(ROOTDIR)/firmware/include \ | 21 | -I$(ROOTDIR)/firmware/include \ |
21 | -I$(ROOTDIR)/firmware/target/hosted \ | 22 | -I$(ROOTDIR)/firmware/target/hosted \ |
diff --git a/tools/database/database.make b/tools/database/database.make index 8eae4925d5..970aeb5581 100644 --- a/tools/database/database.make +++ b/tools/database/database.make | |||
@@ -26,6 +26,7 @@ DATABASE_OBJ = $(call c2obj,$(DATABASE_SRC)) | |||
26 | OTHER_SRC += $(DATABASE_SRC) | 26 | OTHER_SRC += $(DATABASE_SRC) |
27 | 27 | ||
28 | INCLUDES += -I$(ROOTDIR)/apps/gui \ | 28 | INCLUDES += -I$(ROOTDIR)/apps/gui \ |
29 | -I$(FIRMDIR)/kernel/include \ | ||
29 | -I$(ROOTDIR)/firmware/export \ | 30 | -I$(ROOTDIR)/firmware/export \ |
30 | -I$(ROOTDIR)/firmware/include \ | 31 | -I$(ROOTDIR)/firmware/include \ |
31 | -I$(ROOTDIR)/apps \ | 32 | -I$(ROOTDIR)/apps \ |