diff options
| author | Oliver Schinagl <oliver@schinagl.nl> | 2004-12-08 11:48:51 (GMT) |
|---|---|---|
| committer | Oliver Schinagl <oliver@schinagl.nl> | 2004-12-08 11:48:51 (GMT) |
| commit | d41f7d35da426a8888fa8e4504667b1d40571304 (patch) | |
| tree | 2974eb151d86db4c87c6ea6e784f95bc91bbba8d | |
| parent | 2ff650aef0c77a560e292506970f4d0994a0605c (diff) | |
| download | TASS-d41f7d35da426a8888fa8e4504667b1d40571304.zip TASS-d41f7d35da426a8888fa8e4504667b1d40571304.tar.gz TASS-d41f7d35da426a8888fa8e4504667b1d40571304.tar.bz2 | |
Rewrote equalizer loading function. We now load presets from an extra blockram instead of the main ram.
| -rw-r--r-- | Graphic_Equalizer/include/events.hch | 2 | ||||
| -rw-r--r-- | Graphic_Equalizer/src/events.hcc | 52 |
2 files changed, 19 insertions, 35 deletions
diff --git a/Graphic_Equalizer/include/events.hch b/Graphic_Equalizer/include/events.hch index 0f43841..885e89f 100644 --- a/Graphic_Equalizer/include/events.hch +++ b/Graphic_Equalizer/include/events.hch @@ -26,7 +26,7 @@ * This function loads 768 4bits presets into the equalizer_levels array
* pointed to by equalizer_levels.
*/
-void load_preset(unsigned 20 preset_address, unsigned 4 *equalizer_levels);
+void load_preset(unsigned 10 preset, unsigned 4 *equalizer_levels_ptr);
#else
#error "ERROR file events.hch multiple times included"
diff --git a/Graphic_Equalizer/src/events.hcc b/Graphic_Equalizer/src/events.hcc index 3772193..2e8c272 100644 --- a/Graphic_Equalizer/src/events.hcc +++ b/Graphic_Equalizer/src/events.hcc @@ -34,50 +34,34 @@ #endif
-/*! \fn void load_preset(unsigned 20 preset_address, unsigned 4 *equalizer_levels);
+ram unsigned 8 presets_default_values[768] = {
+#include "presets_hardcoded.txt"
+};
+
+
+
+/*! \fn void load_preset(unsigned 10 preset, unsigned 4 *equalizer_levels_ptr);
* \brief This function loads 768 4bits presets into the equalizer_levels
* array pointed to by equalizer_levels.
*
- * \param preset_address PL2Ram address where preset to be
- * loaded is.
* \param *equalizer_levels Location where to store presets loaded
- * from ram.
+ * from blockram.
*
* \return void
* \retval void
*/
-void load_preset(unsigned 20 preset_address, unsigned 4 *equalizer_levels) {
- macro expr RAM_BANK0 = PalPL2RAMCT(0);
- macro expr AW = PalPL2RAMGetMaxAddressWidthCT();
- macro expr DW = PalPL2RAMGetMaxDataWidthCT();
-
- unsigned DW data;
- unsigned AW address;
+void load_preset(unsigned 10 preset, unsigned 4 *equalizer_levels_ptr) {
unsigned 10 equalizer_index;
+ unsigned 4 temp;
- address = preset_address;
- /*
- * PL2Ram needs a clockclycle between the set of an address and read.
- * Therefore we set it once here.
- */
- PalPL2RAMSetReadAddress(RAM_BANK0, address);
-
- /*
- *
- */
- for (equalizer_index = 0; equalizer_index != 768; equalizer_index += 2) {
- /*
- * We've allready set the address hence we can allready
- * increase it for next use.
- */
- address++;
-
- PalPL2RAMRead(RAM_BANK0, &data);
-#if HAVE_DEBUG
- print_hex_value(0 @ data[3:0]);print_string(" ");print_hex_value(0 @ data[7:4]);print_eol();
-#endif
- equalizer_levels[equalizer_index] = data[3:0];
- equalizer_levels[equalizer_index +1] = data[7:4];
+ equalizer_index = 0;
+ while (equalizer_index != 768) {
+ temp = presets_default_values[preset +(0 @ (equalizer_index \\ 1))][7:4];
+ equalizer_levels_ptr[equalizer_index] = temp;
+ temp = presets_default_values[preset +(0 @ (equalizer_index \\ 1))][3:0];
+ equalizer_levels_ptr[equalizer_index +1] = temp;
+
+ equalizer_index += 2;
}
} /* --- load_preset() --- */
|