Changed data to match our new 'interleaved' images.

1 files changed, 33 insertions, 35 deletions

diff --git a/Graphic_Equalizer/include/smartmedia_shared.hch b/Graphic_Equalizer/include/smartmedia_shared.hch
index 490002d..3d57f65 100644
--- a/Graphic_Equalizer/include/smartmedia_shared.hch
+++ b/Graphic_Equalizer/include/smartmedia_shared.hch
@@ -26,62 +26,61 @@
  * in anyway! For example, 640 pixels times 480 pixels is 307200 (4b000) pixels

  * total.

  */

-#define SIZE_SKIN		0x04afff /*Number of pixels*/

+#define SIZE_SKIN		0x04afff 	/* Number of pixels */

 

-#define SIZE_HELP		0x04afff /*Number of pixels*/

+#define SIZE_HELP		0x04afff 	/* Number of pixels */

 

-#define SIZE_GRAPH		0x04afff /*Number of pixels*/

+#define SIZE_GRAPH		0x04afff 	/* Number of pixels */

+

+#define SIZE_ABOUT_TOP		0x00e989	/* Number of pixels */

+

+#define SIZE_ABOUT_BOTTOM	0x00890b	/* Number of pixels */

+

+#define SIZE_PRESET		383		/* Number of elements */

 

-#define SIZE_ABOUT_TOP		0x00e989 /*Number of pixels*/

 

-#define SIZE_ABOUT_BOTTOM	0x00890b /*Number of pixels*/

 

-#define SIZE_PRESET		0x0001bf /*Number of bytes*/

 /*

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

  */

 

 #define SMARTMEDIA_ADDRESS_CONFIGURATION		0x084000 /* Block:  33 */

 #define SMARTMEDIA_ADDRESS_PRESET_DEMO_START		0x088000 /* Block:  34 */

-#define SMARTMEDIA_ADDRESS_PRESET_RESET_START		0x08b000 /* Block:  35 */

+#define SMARTMEDIA_ADDRESS_PRESET_RESET_START		0x08c000 /* Block:  35 */

 

 #define SMARTMEDIA_ADDRESS_SKIN_START			0x090000 /* Block:  36 */

-#define SMARTMEDIA_ADDRESS_SKINMASK_START		0x174000 /* Block:  93 */

 #define SMARTMEDIA_ADDRESS_HELP_START			0x1c0000 /* Block: 112 */

-#define SMARTMEDIA_ADDRESS_HELPMASK_START		0x2a4000 /* Block: 169 */

-#define SMARTMEDIA_ADDRESS_GRAPHMASK_START		0x2f0000 /* Block: 188 */

+#define SMARTMEDIA_ADDRESS_GRAPH_START			0x2f0000 /* Block: 188 */

 

 #define SMARTMEDIA_ADDRESS_TOP_FONTYS_START		0x33c000 /* Block: 207 */

-#define SMARTMEDIA_ADDRESS_TOP_TASS_START		0x368000 /* Block: 218 */

-#define SMARTMEDIA_ADDRESS_TOP_TRANSFER_START		0x394000 /* Block: 229 */

-#define SMARTMEDIA_ADDRESS_TOP_CELOXICA_START		0x3c0000 /* Block: 240 */

-#define SMARTMEDIA_ADDRESS_TOP_DETAILS_START		0x3ec000 /* Block: 251 */

-#define SMARTMEDIA_ADDRESS_TOPMASK_START		0x418000 /* Block: 262 */

+#define SMARTMEDIA_ADDRESS_TOP_TASS_START		0x37c000 /* Block: 223 */

+#define SMARTMEDIA_ADDRESS_TOP_TRANSFER_START		0x3bc000 /* Block: 239 */

+#define SMARTMEDIA_ADDRESS_TOP_CELOXICA_START		0x3fc000 /* Block: 255 */

+#define SMARTMEDIA_ADDRESS_TOP_DETAILS_START		0x43c000 /* Block: 271 */

+

+#define SMARTMEDIA_ADDRESS_BOTTOM_START			0x47c000 /* Block: 287 */

 

-#define SMARTMEDIA_ADDRESS_BOTTOM_START			0x428000 /* Block: 266 */

-#define SMARTMEDIA_ADDRESS_BOTTOMMASK_START		0x444000 /* Block: 273 */

 

 #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 SMARTMEDIA_ADDRESS_SKIN_END		(SMARTMEDIA_ADDRESS_SKIN_START +(SIZE_SKIN *3))

-#define SMARTMEDIA_ADDRESS_SKINMASK_END		(SMARTMEDIA_ADDRESS_SKINMASK_START +(SIZE_SKIN))

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

-#define SMARTMEDIA_ADDRESS_HELPMASK_END		(SMARTMEDIA_ADDRESS_HELPMASK_START +(SIZE_HELP))

-#define SMARTMEDIA_ADDRESS_GRAPHMASK_END	(SMARTMEDIA_ADDRESS_GRAPHMASK_START +SIZE_GRAPH)

+#define SMARTMEDIA_ADDRESS_SKIN_END		(SMARTMEDIA_ADDRESS_SKIN_START +(SIZE_SKIN << 2))

+#define SMARTMEDIA_ADDRESS_HELP_END		(SMARTMEDIA_ADDRESS_HELP_START +(SIZE_HELP << 2))

+#define SMARTMEDIA_ADDRESS_GRAPH_END		(SMARTMEDIA_ADDRESS_GRAPHMASK_START +SIZE_GRAPH)

+

+#define SMARTMEDIA_ADDRESS_TOP_FONTYS_END	(SMARTMEDIA_ADDRESS_TOP_FONTYS_START +(SIZE_ABOUT_TOP << 2))

+#define SMARTMEDIA_ADDRESS_TOP_TASS__END	(SMARTMEDIA_ADDRESS_TOP_TASS_START +(SIZE_ABOUT_TOP <<2))

+#define SMARTMEDIA_ADDRESS_TOP_TRANSFER_END	(SMARTMEDIA_ADDRESS_TOP_TRANSFER_START +(SIZE_ABOUT_TOP <<2))

+#define SMARTMEDIA_ADDRESS_TOP_CELOXICA_END	(SMARTMEDIA_ADDRESS_TOP_CELOXICA_START +(SIZE_ABOUT_TOP <<2))

+#define SMARTMEDIA_ADDRESS_TOP_DETAILS_END	(SMARTMEDIA_ADDRESS_TOP_DETAILS_START +(SIZE_ABOUT_TOP <<2))

 

-#define SMARTMEDIA_ADDRESS_TOP_FONTYS_END	(SMARTMEDIA_ADDRESS_TOP_FONTYS_START +(SIZE_ABOUT_TOP *3))

-#define SMARTMEDIA_ADDRESS_TOP_TASS__END	(SMARTMEDIA_ADDRESS_TOP_TASS_START +(SIZE_ABOUT_TOP *3))

-#define SMARTMEDIA_ADDRESS_TOP_TRANSFER_END	(SMARTMEDIA_ADDRESS_TOP_TRANSFER_START +(SIZE_ABOUT_TOP *3))

-#define SMARTMEDIA_ADDRESS_TOP_CELOXICA_END	(SMARTMEDIA_ADDRESS_TOP_CELOXICA_START +(SIZE_ABOUT_TOP *3))

-#define SMARTMEDIA_ADDRESS_TOP_DETAILS_END	(SMARTMEDIA_ADDRESS_TOP_DETAILS_START +(SIZE_ABOUT_TOP *3))

-#define SMARTMEDIA_ADDRESS_TOPMASK_END		(SMARTMEDIA_ADDRESS_TOPMASK_START +(SIZE_ABOUT_TOP))

+#define SMARTMEDIA_ADDRESS_BOTTOM_END		(SMARTMEDIA_ADDRESS_BOTTOM_START +(SIZE_ABOUT_BOTTOM <<2))

 

-#define SMARTMEDIA_ADDRESS_BOTTOM_END		(SMARTMEDIA_ADDRESS_BOTTOM_START +(SIZE_ABOUT_BOTTOM *3))

-#define SMARTMEDIA_ADDRESS_BOTTOMMASK_END	(SMARTMEDIA_ADDRESS_BOTTOMMASK_START +(SIZE_ABOUT_BOTTOM))

+#define INDEX_PRESET_DEMO_START	0

+#define INDEX_PRESET_DEMO_END		(INDEX_PRESET_DEMO_START +SIZE_PRESET)

 

-#define ADDRESS_PRESET_RESET_START	0x0001c0

-#define ADDRESS_PRESET_RESET_END	(ADDRESS_PRESET_RESET_START +SIZE_PRESET)

+#define INDEX_PRESET_RESET_START	384

+#define INDEX_PRESET_RESET_END		(INDEX_PRESET_RESET_START +SIZE_PRESET)

 

 #define ADDRESS_SKIN_START		0x000000

 #define ADDRESS_SKIN_END		(ADDRESS_SKIN_START +SIZE_SKIN)

@@ -89,8 +88,8 @@
 #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  <<2))

+#define ADDRESS_GRAPH_START		0x096000

+#define ADDRESS_GRAPH_END		(ADDRESS_GRAPH_START +(SIZE_GRAPH >>2))

 

 #define ADDRESS_ABOUT_TOP_FONTYS_START		0x0a8c00

 #define ADDRESS_ABOUT_TOP_FONTYS_END		(ADDRESS_ABOUT_TOP_FONTYS_START +SIZE_ABOUT_TOP)

@@ -100,7 +99,6 @@
 #define ADDRESS_ABOUT_TOP_TRANSFER_END		(ADDRESS_ABOUT_TOP_TRANSFER_START +SIZE_ABOUT_TOP)

 #define ADDRESS_ABOUT_TOP_CELOXICA_START	0x0d489e

 #define ADDRESS_ABOUT_TOP_CELOXICA_END		(ADDRESS_ABOUT_TOP_CELOXICA_START +SIZE_ABOUT_TOP)

-

 #define ADDRESS_ABOUT_TOP_DETAILS_START		0x0e3228

 #define ADDRESS_ABOUT_TOP_DETAILS_END		(ADDRESS_ABOUT_TOP_DETAILS_START +SIZE_ABOUT_TOP)