From d6c054575b4561b4c657565ecb4ff82565fa6c78 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Mon, 29 Aug 2005 21:15:27 +0000 Subject: Renamed CONFIG_HWCODEC and MASNONE to the more appropriate CONFIG_CODEC and SWCODEC, respectively. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7416 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config-fmrecorder.h | 2 +- firmware/export/config-gmini120.h | 2 +- firmware/export/config-gminisp.h | 2 +- firmware/export/config-h100.h | 2 +- firmware/export/config-h120.h | 2 +- firmware/export/config-h300.h | 2 +- firmware/export/config-iaudiox5.h | 2 +- firmware/export/config-ondiofm.h | 2 +- firmware/export/config-ondiosp.h | 2 +- firmware/export/config-player.h | 2 +- firmware/export/config-recorder.h | 2 +- firmware/export/config-recorderv2.h | 2 +- firmware/export/config.h | 4 ++-- firmware/export/id3.h | 6 +++--- firmware/export/mas.h | 12 ++++++------ firmware/export/mp3_playback.h | 2 +- firmware/export/mpeg.h | 2 +- firmware/export/sound.h | 2 +- 18 files changed, 26 insertions(+), 26 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index c53388984f..cf2e65addf 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h @@ -29,7 +29,7 @@ #ifndef SIMULATOR /* Define this if you have a MAS3587F */ -#define CONFIG_HWCODEC MAS3587F +#define CONFIG_CODEC MAS3587F /* Define this if you have a SH7034 */ #define CONFIG_CPU SH7034 diff --git a/firmware/export/config-gmini120.h b/firmware/export/config-gmini120.h index 18019464e3..c833435dea 100644 --- a/firmware/export/config-gmini120.h +++ b/firmware/export/config-gmini120.h @@ -38,7 +38,7 @@ #define CONFIG_I2C I2C_GMINI /* Define this if you do software codec */ -#define CONFIG_HWCODEC MASNONE +#define CONFIG_CODEC SWCODEC /* Type of mobile power, FIXME: probably different, make new type */ #define CONFIG_BATTERY BATT_LIION2200 diff --git a/firmware/export/config-gminisp.h b/firmware/export/config-gminisp.h index 2881471bc1..982e8f3725 100644 --- a/firmware/export/config-gminisp.h +++ b/firmware/export/config-gminisp.h @@ -32,7 +32,7 @@ #define CONFIG_I2C I2C_GMINI /* Define this if you do software codec */ -#define CONFIG_HWCODEC MASNONE +#define CONFIG_CODEC SWCODEC /* Type of mobile power, FIXME: probably different, make new type */ #define CONFIG_BATTERY BATT_LIION2200 diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index 1fd73c25d3..bdb1b1a163 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h @@ -31,7 +31,7 @@ #define CONFIG_REMOTE_KEYPAD H100_REMOTE /* Define this if you do software codec */ -#define CONFIG_HWCODEC MASNONE +#define CONFIG_CODEC SWCODEC /* Define this if you have an remote lcd */ #define HAVE_REMOTE_LCD diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index a1828efad2..2691a8a693 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h @@ -27,7 +27,7 @@ #define CONFIG_REMOTE_KEYPAD H100_REMOTE /* Define this if you do software codec */ -#define CONFIG_HWCODEC MASNONE +#define CONFIG_CODEC SWCODEC /* Define this if you have an remote lcd */ #define HAVE_REMOTE_LCD diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h index 251b6912b3..df97fd245d 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h @@ -25,7 +25,7 @@ #define CONFIG_REMOTE_KEYPAD H300_REMOTE /* Define this if you do software codec */ -#define CONFIG_HWCODEC MASNONE +#define CONFIG_CODEC SWCODEC /* Define this if you have an remote lcd */ #define HAVE_REMOTE_LCD diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index e2a170af66..f7d18c829e 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h @@ -24,7 +24,7 @@ #define CONFIG_KEYPAD IAUDIO_X5_PAD /* Define this if you do software codec */ -#define CONFIG_HWCODEC MASNONE +#define CONFIG_CODEC SWCODEC /* Define this if you have an remote lcd */ #define HAVE_REMOTE_LCD diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h index 1b2857668a..a384bae5b6 100644 --- a/firmware/export/config-ondiofm.h +++ b/firmware/export/config-ondiofm.h @@ -28,7 +28,7 @@ #define CONFIG_CPU SH7034 /* Define this if you have a MAS3587F */ -#define CONFIG_HWCODEC MAS3587F +#define CONFIG_CODEC MAS3587F /* Define this to the CPU frequency */ #define CPU_FREQ 12000000 diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h index 7ccda3257b..f3ba51209b 100644 --- a/firmware/export/config-ondiosp.h +++ b/firmware/export/config-ondiosp.h @@ -21,7 +21,7 @@ #define CONFIG_CPU SH7034 /* Define this if you have a MAS3539F */ -#define CONFIG_HWCODEC MAS3539F +#define CONFIG_CODEC MAS3539F /* Define this to the CPU frequency */ #define CPU_FREQ 12000000 diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h index 70858a1636..c2dd7572b7 100644 --- a/firmware/export/config-player.h +++ b/firmware/export/config-player.h @@ -20,7 +20,7 @@ #define CONFIG_CPU SH7034 /* Define this if you have a MAS3507D */ -#define CONFIG_HWCODEC MAS3507D +#define CONFIG_CODEC MAS3507D /* Define this if you have a DAC3550A */ #define HAVE_DAC3550A diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h index 51cdb79321..4df6fbfc6d 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h @@ -23,7 +23,7 @@ #ifndef SIMULATOR /* Define this if you have a MAS3587F */ -#define CONFIG_HWCODEC MAS3587F +#define CONFIG_CODEC MAS3587F /* Define this if you have a SH7034 */ #define CONFIG_CPU SH7034 diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index b2d6d01669..da0bb41f80 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h @@ -29,7 +29,7 @@ #define CONFIG_CPU SH7034 /* Define this if you have a MAS3587F */ -#define CONFIG_HWCODEC MAS3587F +#define CONFIG_CODEC MAS3587F /* Define this if you have a FM Recorder key system */ #define HAVE_FMADC 1 diff --git a/firmware/export/config.h b/firmware/export/config.h index 1463656d03..bd817dcb2f 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -28,11 +28,11 @@ #define S1A0903X01 0x01 /* Samsung */ #define TEA5767 0x02 /* Philips */ -/* CONFIG_HWCODEC */ +/* CONFIG_CODEC */ #define MAS3587F 3587 #define MAS3507D 3507 #define MAS3539F 3539 -#define MASNONE 1 /* if codec is done by SW */ +#define SWCODEC 1 /* if codec is done by SW */ /* CONFIG_CPU */ #define SH7034 7034 diff --git a/firmware/export/id3.h b/firmware/export/id3.h index abb354b233..5deebd41de 100644 --- a/firmware/export/id3.h +++ b/firmware/export/id3.h @@ -28,14 +28,14 @@ enum { AFMT_UNKNOWN = 1, /* Unknown file format */ -#if CONFIG_HWCODEC==MASNONE +#if CONFIG_CODEC==SWCODEC AFMT_MPA_L1, /* MPEG Audio layer 1 */ #endif AFMT_MPA_L2, /* MPEG Audio layer 2 */ AFMT_MPA_L3, /* MPEG Audio layer 3 */ -#if CONFIG_HWCODEC==MASNONE +#if CONFIG_CODEC==SWCODEC AFMT_PCM_WAV, /* Uncompressed PCM in a WAV file */ AFMT_OGG_VORBIS, /* Ogg Vorbis */ AFMT_FLAC, /* FLAC */ @@ -118,7 +118,7 @@ struct mp3entry { /* replaygain support */ -#if CONFIG_HWCODEC == MASNONE +#if CONFIG_CODEC == SWCODEC char* track_gain_string; char* album_gain_string; long track_gain; /* 7.24 signed fixed point. 0 for no gain. */ diff --git a/firmware/export/mas.h b/firmware/export/mas.h index f682fc676e..d25a1538ca 100644 --- a/firmware/export/mas.h +++ b/firmware/export/mas.h @@ -27,7 +27,7 @@ /* MAS I2C defs */ -#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) +#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) #define MAS_ADR 0x3c #define MAS_DEV_WRITE (MAS_ADR | 0x00) #define MAS_DEV_READ (MAS_ADR | 0x01) @@ -38,7 +38,7 @@ #endif /* registers..*/ -#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) +#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) #define MAS_DATA_WRITE 0x68 #define MAS_DATA_READ 0x69 #define MAS_CODEC_WRITE 0x6c @@ -62,7 +62,7 @@ #define MAS_REG_KPRESCALE 0xe7 #define MAS_REG_KBASS 0x6b #define MAS_REG_KTREBLE 0x6f -#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) +#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) #define MAS_REG_KMDB_SWITCH 0x21 #define MAS_REG_KMDB_STR 0x22 #define MAS_REG_KMDB_HAR 0x23 @@ -78,7 +78,7 @@ /* * MAS commands */ -#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) +#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) #define MAS_CMD_READ_ANCILLARY 0x50 #define MAS_CMD_FAST_PRG_DL 0x60 #define MAS_CMD_READ_IC_VER 0x70 @@ -101,7 +101,7 @@ /* * MAS D0 memory cells (MAS3587F / MAS3539F) */ -#if CONFIG_HWCODEC == MAS3587F +#if CONFIG_CODEC == MAS3587F #define MAS_D0_APP_SELECT 0x7f6 #define MAS_D0_APP_RUNNING 0x7f7 #define MAS_D0_ENCODER_CONTROL 0x7f0 @@ -120,7 +120,7 @@ #define MAS_D0_MPEG_STATUS_2 0xfd2 #define MAS_D0_CRC_ERROR_COUNT 0xfd3 -#elif CONFIG_HWCODEC == MAS3539F +#elif CONFIG_CODEC == MAS3539F #define MAS_D0_APP_SELECT 0x34b #define MAS_D0_APP_RUNNING 0x34c /* no encoder :( */ diff --git a/firmware/export/mp3_playback.h b/firmware/export/mp3_playback.h index 3611c1c9c1..772eafe971 100644 --- a/firmware/export/mp3_playback.h +++ b/firmware/export/mp3_playback.h @@ -32,7 +32,7 @@ void mp3_init(int volume, int bass, int treble, int balance, int loudness, bool superbass); /* exported just for mpeg.c, to keep the recording there */ -#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) +#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) void demand_irq_enable(bool on); #endif diff --git a/firmware/export/mpeg.h b/firmware/export/mpeg.h index d8dea3d143..6ce3b47275 100644 --- a/firmware/export/mpeg.h +++ b/firmware/export/mpeg.h @@ -43,7 +43,7 @@ /* For ID3 info and VBR header */ #define MPEG_RESERVED_HEADER_SPACE (4096 + 1500) -#if (CONFIG_HWCODEC == MAS3587F) || defined(SIMULATOR) +#if (CONFIG_CODEC == MAS3587F) || defined(SIMULATOR) void mpeg_init_recording(void); void mpeg_record(const char *filename); void mpeg_new_file(const char *filename); diff --git a/firmware/export/sound.h b/firmware/export/sound.h index 9f4cd60ae8..772e2d6655 100644 --- a/firmware/export/sound.h +++ b/firmware/export/sound.h @@ -54,7 +54,7 @@ int sound_val2phys(int setting, int value); const char *sound_unit(int setting); int sound_numdecimals(int setting); int sound_steps(int setting); -#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) || defined(SIMULATOR) +#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) || defined(SIMULATOR) void sound_set_pitch(int permille); int sound_get_pitch(void); #endif -- cgit v1.2.3