summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/as3525.h1
-rw-r--r--firmware/export/config/sansac200v2.h9
-rw-r--r--firmware/export/config/sansaclip.h9
-rw-r--r--firmware/export/config/sansaclipplus.h9
-rw-r--r--firmware/export/config/sansaclipv2.h9
-rw-r--r--firmware/export/config/sansaclipzip.h9
-rw-r--r--firmware/export/config/sansae200v2.h9
-rw-r--r--firmware/export/config/sansafuze.h9
-rw-r--r--firmware/export/config/sansafuzev2.h9
-rw-r--r--firmware/export/config/sansam200v4.h9
-rw-r--r--firmware/export/pcm_sampr.h5
11 files changed, 76 insertions, 11 deletions
diff --git a/firmware/export/as3525.h b/firmware/export/as3525.h
index 87e3fc43d7..c5e01d5bc8 100644
--- a/firmware/export/as3525.h
+++ b/firmware/export/as3525.h
@@ -526,7 +526,6 @@ CE lines
526 526
527/* PCM addresses for obtaining buffers will be what DMA is using (physical) */ 527/* PCM addresses for obtaining buffers will be what DMA is using (physical) */
528#define HAVE_PCM_DMA_ADDRESS 528#define HAVE_PCM_DMA_ADDRESS
529#define HAVE_PCM_REC_DMA_ADDRESS
530 529
531/* Timer frequency */ 530/* Timer frequency */
532#define TIMER_FREQ (24000000 / 16) 531#define TIMER_FREQ (24000000 / 16)
diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config/sansac200v2.h
index 4223d41b92..a5b857fe81 100644
--- a/firmware/export/config/sansac200v2.h
+++ b/firmware/export/config/sansac200v2.h
@@ -14,7 +14,14 @@
14/* define this if you have recording possibility */ 14/* define this if you have recording possibility */
15#define HAVE_RECORDING 15#define HAVE_RECORDING
16 16
17#define REC_SAMPR_CAPS SAMPR_CAP_ALL 17#define REC_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \
18 SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \
19 SAMPR_CAP_12 | SAMPR_CAP_11 | SAMPR_CAP_8)
20
21/* because the samplerates don't match at each point, we must be able to
22 * tell PCM which set of rates to use. not needed if recording rates are
23 * a simple subset of playback rates and are equal values. */
24#define CONFIG_SAMPR_TYPES
18 25
19/* Define bitmask of input sources - recordable bitmask can be defined 26/* Define bitmask of input sources - recordable bitmask can be defined
20 explicitly if different */ 27 explicitly if different */
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config/sansaclip.h
index 7427d623fb..4e214669b1 100644
--- a/firmware/export/config/sansaclip.h
+++ b/firmware/export/config/sansaclip.h
@@ -14,7 +14,14 @@
14/* define this if you have recording possibility */ 14/* define this if you have recording possibility */
15#define HAVE_RECORDING 15#define HAVE_RECORDING
16 16
17#define REC_SAMPR_CAPS SAMPR_CAP_ALL 17#define REC_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \
18 SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \
19 SAMPR_CAP_12 | SAMPR_CAP_11 | SAMPR_CAP_8)
20
21/* because the samplerates don't match at each point, we must be able to
22 * tell PCM which set of rates to use. not needed if recording rates are
23 * a simple subset of playback rates and are equal values. */
24#define CONFIG_SAMPR_TYPES
18 25
19/* Define bitmask of input sources - recordable bitmask can be defined 26/* Define bitmask of input sources - recordable bitmask can be defined
20 explicitly if different */ 27 explicitly if different */
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h
index 8a0a0403f3..0ae67b70d0 100644
--- a/firmware/export/config/sansaclipplus.h
+++ b/firmware/export/config/sansaclipplus.h
@@ -21,7 +21,14 @@
21/* define this if you have recording possibility */ 21/* define this if you have recording possibility */
22#define HAVE_RECORDING 22#define HAVE_RECORDING
23 23
24#define REC_SAMPR_CAPS SAMPR_CAP_ALL 24#define REC_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \
25 SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \
26 SAMPR_CAP_12 | SAMPR_CAP_11 | SAMPR_CAP_8)
27
28/* because the samplerates don't match at each point, we must be able to
29 * tell PCM which set of rates to use. not needed if recording rates are
30 * a simple subset of playback rates and are equal values. */
31#define CONFIG_SAMPR_TYPES
25 32
26/* Define bitmask of input sources - recordable bitmask can be defined 33/* Define bitmask of input sources - recordable bitmask can be defined
27 explicitly if different */ 34 explicitly if different */
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h
index a39fe3e12c..d7a50afa20 100644
--- a/firmware/export/config/sansaclipv2.h
+++ b/firmware/export/config/sansaclipv2.h
@@ -14,7 +14,14 @@
14/* define this if you have recording possibility */ 14/* define this if you have recording possibility */
15#define HAVE_RECORDING 15#define HAVE_RECORDING
16 16
17#define REC_SAMPR_CAPS SAMPR_CAP_ALL 17#define REC_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \
18 SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \
19 SAMPR_CAP_12 | SAMPR_CAP_11 | SAMPR_CAP_8)
20
21/* because the samplerates don't match at each point, we must be able to
22 * tell PCM which set of rates to use. not needed if recording rates are
23 * a simple subset of playback rates and are equal values. */
24#define CONFIG_SAMPR_TYPES
18 25
19/* Define bitmask of input sources - recordable bitmask can be defined 26/* Define bitmask of input sources - recordable bitmask can be defined
20 explicitly if different */ 27 explicitly if different */
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h
index 3df9ed57fd..e0f39afcf1 100644
--- a/firmware/export/config/sansaclipzip.h
+++ b/firmware/export/config/sansaclipzip.h
@@ -21,7 +21,14 @@
21/* define this if you have recording possibility */ 21/* define this if you have recording possibility */
22#define HAVE_RECORDING 22#define HAVE_RECORDING
23 23
24#define REC_SAMPR_CAPS SAMPR_CAP_ALL 24#define REC_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \
25 SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \
26 SAMPR_CAP_12 | SAMPR_CAP_11 | SAMPR_CAP_8)
27
28/* because the samplerates don't match at each point, we must be able to
29 * tell PCM which set of rates to use. not needed if recording rates are
30 * a simple subset of playback rates and are equal values. */
31#define CONFIG_SAMPR_TYPES
25 32
26/* Define bitmask of input sources - recordable bitmask can be defined 33/* Define bitmask of input sources - recordable bitmask can be defined
27 explicitly if different */ 34 explicitly if different */
diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config/sansae200v2.h
index 34c2cd98ad..a03dfe05a6 100644
--- a/firmware/export/config/sansae200v2.h
+++ b/firmware/export/config/sansae200v2.h
@@ -12,7 +12,14 @@
12/* define this if you have recording possibility */ 12/* define this if you have recording possibility */
13#define HAVE_RECORDING 13#define HAVE_RECORDING
14 14
15#define REC_SAMPR_CAPS SAMPR_CAP_ALL 15#define REC_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \
16 SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \
17 SAMPR_CAP_12 | SAMPR_CAP_11 | SAMPR_CAP_8)
18
19/* because the samplerates don't match at each point, we must be able to
20 * tell PCM which set of rates to use. not needed if recording rates are
21 * a simple subset of playback rates and are equal values. */
22#define CONFIG_SAMPR_TYPES
16 23
17/* Define bitmask of input sources - recordable bitmask can be defined 24/* Define bitmask of input sources - recordable bitmask can be defined
18 explicitly if different */ 25 explicitly if different */
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config/sansafuze.h
index 8563664cb8..2e9c261a04 100644
--- a/firmware/export/config/sansafuze.h
+++ b/firmware/export/config/sansafuze.h
@@ -12,7 +12,14 @@
12/* define this if you have recording possibility */ 12/* define this if you have recording possibility */
13#define HAVE_RECORDING 13#define HAVE_RECORDING
14 14
15#define REC_SAMPR_CAPS SAMPR_CAP_ALL 15#define REC_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \
16 SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \
17 SAMPR_CAP_12 | SAMPR_CAP_11 | SAMPR_CAP_8)
18
19/* because the samplerates don't match at each point, we must be able to
20 * tell PCM which set of rates to use. not needed if recording rates are
21 * a simple subset of playback rates and are equal values. */
22#define CONFIG_SAMPR_TYPES
16 23
17/* Default recording levels */ 24/* Default recording levels */
18#define DEFAULT_REC_MIC_GAIN 23 25#define DEFAULT_REC_MIC_GAIN 23
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h
index 1c0f8a99dc..7465010166 100644
--- a/firmware/export/config/sansafuzev2.h
+++ b/firmware/export/config/sansafuzev2.h
@@ -12,7 +12,14 @@
12/* define this if you have recording possibility */ 12/* define this if you have recording possibility */
13#define HAVE_RECORDING 13#define HAVE_RECORDING
14 14
15#define REC_SAMPR_CAPS SAMPR_CAP_ALL 15#define REC_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \
16 SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \
17 SAMPR_CAP_12 | SAMPR_CAP_11 | SAMPR_CAP_8)
18
19/* because the samplerates don't match at each point, we must be able to
20 * tell PCM which set of rates to use. not needed if recording rates are
21 * a simple subset of playback rates and are equal values. */
22#define CONFIG_SAMPR_TYPES
16 23
17/* Default recording levels */ 24/* Default recording levels */
18#define DEFAULT_REC_MIC_GAIN 23 25#define DEFAULT_REC_MIC_GAIN 23
diff --git a/firmware/export/config/sansam200v4.h b/firmware/export/config/sansam200v4.h
index 88679c1a78..52b10a4431 100644
--- a/firmware/export/config/sansam200v4.h
+++ b/firmware/export/config/sansam200v4.h
@@ -16,7 +16,14 @@
16/* define this if you have recording possibility */ 16/* define this if you have recording possibility */
17#define HAVE_RECORDING 17#define HAVE_RECORDING
18 18
19#define REC_SAMPR_CAPS SAMPR_CAP_ALL 19#define REC_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \
20 SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \
21 SAMPR_CAP_12 | SAMPR_CAP_11 | SAMPR_CAP_8)
22
23/* because the samplerates don't match at each point, we must be able to
24 * tell PCM which set of rates to use. not needed if recording rates are
25 * a simple subset of playback rates and are equal values. */
26#define CONFIG_SAMPR_TYPES
20 27
21/* Define bitmask of input sources - recordable bitmask can be defined 28/* Define bitmask of input sources - recordable bitmask can be defined
22 explicitly if different */ 29 explicitly if different */
diff --git a/firmware/export/pcm_sampr.h b/firmware/export/pcm_sampr.h
index 62bfd0068b..01a8ed428e 100644
--- a/firmware/export/pcm_sampr.h
+++ b/firmware/export/pcm_sampr.h
@@ -305,6 +305,8 @@ enum rec_freq_indexes
305#define REC_SAMPR_DEFAULT SAMPR_44 305#define REC_SAMPR_DEFAULT SAMPR_44
306#endif 306#endif
307 307
308#define HW_SAMPR_RESET 0
309
308#define REC_FREQ_CFG_VAL_LIST &REC_HAVE_96_(",96") REC_HAVE_88_(",88") \ 310#define REC_FREQ_CFG_VAL_LIST &REC_HAVE_96_(",96") REC_HAVE_88_(",88") \
309 REC_HAVE_64_(",64") REC_HAVE_48_(",48") \ 311 REC_HAVE_64_(",64") REC_HAVE_48_(",48") \
310 REC_HAVE_44_(",44") REC_HAVE_32_(",32") \ 312 REC_HAVE_44_(",44") REC_HAVE_32_(",32") \
@@ -324,7 +326,8 @@ extern const unsigned long rec_freq_sampr[REC_NUM_FREQ];
324#define SAMPR_TYPE_REC (0x01 << 24) 326#define SAMPR_TYPE_REC (0x01 << 24)
325#endif 327#endif
326 328
327unsigned int pcm_sampr_type_rec_to_play(unsigned int samplerate); 329unsigned int pcm_sampr_to_hw_sampr(unsigned int samplerate,
330 unsigned int type);
328 331
329#else /* ndef CONFIG_SAMPR_TYPES */ 332#else /* ndef CONFIG_SAMPR_TYPES */
330 333