diff options
author | Björn Stenberg <bjorn@haxx.se> | 2008-10-14 11:43:32 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2008-10-14 11:43:32 +0000 |
commit | 9cf024c5a8418b9d4850b718ab299863507312a6 (patch) | |
tree | 4f497d352a1918b9b99ac11bb4819fff151f21d4 | |
parent | 9558c4956d3d603c4d132af88633767810f3ba62 (diff) | |
download | rockbox-9cf024c5a8418b9d4850b718ab299863507312a6.tar.gz rockbox-9cf024c5a8418b9d4850b718ab299863507312a6.zip |
Red build fix: Moved PCM #defines from pcm_record.h to pcm.h. Added necessary #includes to statusbar.c and s1a0903x01.c.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18808 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/gui/statusbar.c | 1 | ||||
-rw-r--r-- | apps/recorder/pcm_record.h | 24 | ||||
-rw-r--r-- | firmware/drivers/tuner/s1a0903x01.c | 1 | ||||
-rw-r--r-- | firmware/export/pcm.h | 24 |
4 files changed, 26 insertions, 24 deletions
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index b50ca3b9fb..1e42a6ef93 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #ifdef HAVE_RECORDING | 37 | #ifdef HAVE_RECORDING |
38 | #include "audio.h" | 38 | #include "audio.h" |
39 | #include "recording.h" | 39 | #include "recording.h" |
40 | #include "pcm_record.h" | ||
40 | #endif | 41 | #endif |
41 | 42 | ||
42 | /* FIXME: should be removed from icon.h to avoid redefinition, | 43 | /* FIXME: should be removed from icon.h to avoid redefinition, |
diff --git a/apps/recorder/pcm_record.h b/apps/recorder/pcm_record.h index f805313fe5..f29d0a5da8 100644 --- a/apps/recorder/pcm_record.h +++ b/apps/recorder/pcm_record.h | |||
@@ -22,30 +22,6 @@ | |||
22 | #ifndef PCM_RECORD_H | 22 | #ifndef PCM_RECORD_H |
23 | #define PCM_RECORD_H | 23 | #define PCM_RECORD_H |
24 | 24 | ||
25 | #define DMA_REC_ERROR_DMA (-1) | ||
26 | #ifdef HAVE_SPDIF_REC | ||
27 | #define DMA_REC_ERROR_SPDIF (-2) | ||
28 | #endif | ||
29 | |||
30 | /** Warnings **/ | ||
31 | /* pcm (dma) buffer has overflowed */ | ||
32 | #define PCMREC_W_PCM_BUFFER_OVF 0x00000001 | ||
33 | /* encoder output buffer has overflowed */ | ||
34 | #define PCMREC_W_ENC_BUFFER_OVF 0x00000002 | ||
35 | /** Errors **/ | ||
36 | /* failed to load encoder */ | ||
37 | #define PCMREC_E_LOAD_ENCODER 0x80001000 | ||
38 | /* error originating in encoder */ | ||
39 | #define PCMREC_E_ENCODER 0x80002000 | ||
40 | /* filename queue has desynced from stream markers */ | ||
41 | #define PCMREC_E_FNQ_DESYNC 0x80004000 | ||
42 | /* I/O error has occurred */ | ||
43 | #define PCMREC_E_IO 0x80008000 | ||
44 | #ifdef DEBUG | ||
45 | /* encoder has written past end of allotted space */ | ||
46 | #define PCMREC_E_CHUNK_OVF 0x80010000 | ||
47 | #endif /* DEBUG */ | ||
48 | |||
49 | /** General functions for high level codec recording **/ | 25 | /** General functions for high level codec recording **/ |
50 | /* pcm_rec_error_clear is deprecated for general use. audio_error_clear | 26 | /* pcm_rec_error_clear is deprecated for general use. audio_error_clear |
51 | should be used */ | 27 | should be used */ |
diff --git a/firmware/drivers/tuner/s1a0903x01.c b/firmware/drivers/tuner/s1a0903x01.c index f6442b269f..d2d9de8cfe 100644 --- a/firmware/drivers/tuner/s1a0903x01.c +++ b/firmware/drivers/tuner/s1a0903x01.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include "tuner.h" /* tuner abstraction interface */ | 27 | #include "tuner.h" /* tuner abstraction interface */ |
28 | #include "fmradio.h" /* physical interface driver */ | 28 | #include "fmradio.h" /* physical interface driver */ |
29 | #include "sound.h" | 29 | #include "sound.h" |
30 | #include "mas.h" | ||
30 | 31 | ||
31 | #define DEFAULT_IN1 0x100003 /* Mute */ | 32 | #define DEFAULT_IN1 0x100003 /* Mute */ |
32 | #define DEFAULT_IN2 0x140884 /* 5kHz, 7.2MHz crystal */ | 33 | #define DEFAULT_IN2 0x140884 /* 5kHz, 7.2MHz crystal */ |
diff --git a/firmware/export/pcm.h b/firmware/export/pcm.h index 97a1939dbb..1660f0670d 100644 --- a/firmware/export/pcm.h +++ b/firmware/export/pcm.h | |||
@@ -23,6 +23,30 @@ | |||
23 | 23 | ||
24 | #include <sys/types.h> | 24 | #include <sys/types.h> |
25 | 25 | ||
26 | #define DMA_REC_ERROR_DMA (-1) | ||
27 | #ifdef HAVE_SPDIF_REC | ||
28 | #define DMA_REC_ERROR_SPDIF (-2) | ||
29 | #endif | ||
30 | |||
31 | /** Warnings **/ | ||
32 | /* pcm (dma) buffer has overflowed */ | ||
33 | #define PCMREC_W_PCM_BUFFER_OVF 0x00000001 | ||
34 | /* encoder output buffer has overflowed */ | ||
35 | #define PCMREC_W_ENC_BUFFER_OVF 0x00000002 | ||
36 | /** Errors **/ | ||
37 | /* failed to load encoder */ | ||
38 | #define PCMREC_E_LOAD_ENCODER 0x80001000 | ||
39 | /* error originating in encoder */ | ||
40 | #define PCMREC_E_ENCODER 0x80002000 | ||
41 | /* filename queue has desynced from stream markers */ | ||
42 | #define PCMREC_E_FNQ_DESYNC 0x80004000 | ||
43 | /* I/O error has occurred */ | ||
44 | #define PCMREC_E_IO 0x80008000 | ||
45 | #ifdef DEBUG | ||
46 | /* encoder has written past end of allotted space */ | ||
47 | #define PCMREC_E_CHUNK_OVF 0x80010000 | ||
48 | #endif /* DEBUG */ | ||
49 | |||
26 | /** RAW PCM routines used with playback and recording **/ | 50 | /** RAW PCM routines used with playback and recording **/ |
27 | 51 | ||
28 | /* Typedef for registered callback */ | 52 | /* Typedef for registered callback */ |