Removed Smart Media addresses from here. They are now in SmartMedia-shared.

Moved FFT specific defines to FFT.

1 files changed, 10 insertions, 70 deletions

diff --git a/Graphic_Equalizer/include/configuration.hch b/Graphic_Equalizer/include/configuration.hch
index fb7b123..17c1b3f 100644
--- a/Graphic_Equalizer/include/configuration.hch
+++ b/Graphic_Equalizer/include/configuration.hch
@@ -19,75 +19,21 @@
 #ifndef _CONFIGURATION_HCH

 #define _CONFIGURATION_HCH 1

 

-/*

- * To print debug information on the RS232 port set this define.

- */

-#define HAVE_DEBUG 1

-

-

-

-/*

- * If we don't want to use the SmartMedia (and therefor fill the memory

- * with simple static data) set this to 0. Otherwise 1 will load the smartmedia

- * routines. To only load the mask and not the entire data set USE_MASK_ONLY to

- * 1. 0 will load all bitmaps.

- */

-#define HAVE_SMARTMEDIA 0

-#define USE_MASK_ONLY 0

-#define SKIP_LOAD 1

-

 

 

 /*

- * Here we set the various sizes of the data in use. Do not round this values

- * in anyway! For example, 640 pixels times 480 pixels is 307200 (4b000) pixels

- * total.

+ * To print debug information on the RS232 port set this define.

  */

-#define SIZE_SKIN	0x04afff

-#define SIZE_HELP	0x04afff

-#define SIZE_GRAPH	0x04afff

-#define SIZE_SKINMASK	0x018fff

-#define SIZE_HELPMASK	0x018fff

-#define SIZE_GRAPHMASK	0x018fff

-

-#define SIZE_PRESET	0x0001c0

+#define HAVE_DEBUG 0

 

 

 

 /*

- * Here we setup the start and end address for the various components.

+ * If we don't want to use the SmartMedia set this to 0. Data is then read from

+ * the ram, assuming it's there. Otherwise 1 will load the smartmedia

+ * routines.

  */

-#define ADDRESS_SKIN_START		0x000000

-#define ADDRESS_SKIN_END		(ADDRESS_SKIN_START +SIZE_SKIN)

-

-#define ADDRESS_HELP_START		0x04b000

-#define ADDRESS_HELP_END		(ADDRESS_HELP_START +SIZE_HELP)

-

-#define ADDRESS_GRAPHMASK_START		0x096000

-#define ADDRESS_GRAPHMASK_END		(ADDRESS_GRAPHMASK_START +SIZE_GRAPH)

-

-#define ADDRESS_PRESET_DEMO_START	0x0e1000

-#define ADDRESS_PRESET_DEMO_END		(ADDRESS_PRESET_DEMO_START +SIZE_PRESET)

-#define ADDRESS_PRESET_RESET_START	0x0e11c0

-#define ADDRESS_PRESET_RESET_END	(ADDRESS_PRESET_RESET_START +SIZE_PRESET)

-

-#define SMARTMEDIA_ADDRESS_SKIN_START		0x084000 /* Block:  33 */

-#define SMARTMEDIA_ADDRESS_SKINMASK_START	0x168000 /* Block:  90 */

-#define SMARTMEDIA_ADDRESS_HELP_START		0x1b4000 /* Block: 109 */

-#define SMARTMEDIA_ADDRESS_HELPMASK_START	0x298000 /* Block: 166 */

-#define SMARTMEDIA_ADDRESS_GRAPHMASK_START	0x2e4000 /* Block: 185 */

-

-#define SMARTMEDIA_ADDRESS_PRESET_DEMO_START	0x330000 /* Block: 204 */

-#define SMARTMEDIA_ADDRESS_PRESET_RESET_START	0x340000 /* Block: 205 */

-

-#define SMARTMEDIA_ADDRESS_SKIN_END		(SMARTMEDIA_ADDRESS_SKIN_START +(SIZE_SKIN *3))

-#define SMARTMEDIA_ADDRESS_SKINMASK_END		(SMARTMEDIA_ADDRESS_SKINMASK_START +(SIZE_SKINMASK *3))

-#define SMARTMEDIA_ADDRESS_HELP_END		(SMARTMEDIA_ADDRESS_HELP_START +(SIZE_HELP *3))

-#define SMARTMEDIA_ADDRESS_HELPMASK_END		(SMARTMEDIA_ADDRESS_HELPMASK_START +(SIZE_HELPMASK *3))

-#define SMARTMEDIA_ADDRESS_GRAPHMASK_END	(SMARTMEDIA_ADDRESS_GRAPHMASK_START +(SIZE_GRAPHMASK *3))

-

-#define SMARTMEDIA_ADDRESS_PRESET_DEMO_END	(SMARTMEDIA_ADDRESS_PRESET_DEMO_START +(SIZE_PRESET))

-#define SMARTMEDIA_ADDRESS_PRESET_RESET_END	(SMARTMEDIA_ADDRESS_PRESET_RESET_START +(SIZE_PRESET))

+#define HAVE_SMARTMEDIA 0

 

 

 

@@ -96,21 +42,15 @@
  */

 #define USE_RUNFFT	1

 #define HARDWARE_MULTIPLY 	1

-#define NUMBER_OF_COLUMNS 	8

-#define NUMBER_OF_POINTS 	(1<<NUMBER_OF_COLUMNS)

-#define NUMBER_OF_FREQUENCIES 	(NUMBER_OF_POINTS>>1)

 #define PERFORM_FFT_CALCULATION 1

 #define	USE_UNSIGNED_AUDIO 0

-#define	PRINT_DEBUG 0

-

-#if HARDWARE_MULTIPLY

-#define DC_COMPONENT		0

-#else

-#define DC_COMPONENT		8470527

-#endif

 

+/*

+FIXME:	DK doesn't override from commandline defines. We have to therefore

+	ignore this include guard until we can find around this.

 #else

 #error "ERROR file configuration.hch multiple times included"

+*/

 #endif /* --- _CONFIGURATION_HCH --- */