summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Graphic_Equalizer/include/display.hch10
-rw-r--r--Graphic_Equalizer/include/display_shared.hch2
-rw-r--r--Graphic_Equalizer/include/eventhandler.hch4
-rw-r--r--Graphic_Equalizer/include/eventhandler_shared.hch1
-rw-r--r--Graphic_Equalizer/include/smartmedia.hch27
-rw-r--r--Graphic_Equalizer/include/smartmedia_shared.hch38
6 files changed, 46 insertions, 36 deletions
diff --git a/Graphic_Equalizer/include/display.hch b/Graphic_Equalizer/include/display.hch
index 9b0efe8..940b219 100644
--- a/Graphic_Equalizer/include/display.hch
+++ b/Graphic_Equalizer/include/display.hch
@@ -36,11 +36,11 @@
-#define MASK_AREA_BACKGROUND 0x00
-#define MASK_AREA_ABOUT_TOP 0x01
-#define MASK_AREA_ABOUT_BOTTOM 0x02
-#define MASK_AREA_AUDIO_PLAYER 0x03
-
+#define MASK_AREA_BACKGROUND 0x00
+#define MASK_AREA_ABOUT_TOP 0x01
+#define MASK_AREA_ABOUT_BOTTOM 0x02
+#define MASK_AREA_AUDIO_PLAYER 0x03
+#define MASK_AREA_INPUT_SELECT_TEXT 0x04
/*
diff --git a/Graphic_Equalizer/include/display_shared.hch b/Graphic_Equalizer/include/display_shared.hch
index 294a9e2..8f77278 100644
--- a/Graphic_Equalizer/include/display_shared.hch
+++ b/Graphic_Equalizer/include/display_shared.hch
@@ -96,6 +96,8 @@ typedef struct {
#define BUTTON_INPUT_SELECT 0x26 /*!< Button to toggle between audio inputs*/
+#define AREA_INPUT_SELECT_TEXT 0x27 /*!< Button to toggle between audio inputs*/
+
#define AREA_MASK_END 0x7e /*!< Area in mask determining the end of the area beeing drawn */
#define AREA_EQUALIZER_MIN 0x80 /*!< First bar of the Equalizer Area. */
diff --git a/Graphic_Equalizer/include/eventhandler.hch b/Graphic_Equalizer/include/eventhandler.hch
index bb48f9f..ced9ba6 100644
--- a/Graphic_Equalizer/include/eventhandler.hch
+++ b/Graphic_Equalizer/include/eventhandler.hch
@@ -20,9 +20,9 @@
#define _EVENTHANDLER_HCH 1
+#define LOAD_PRESET_DEMO 0x000
+#define LOAD_PRESET_RESET 0x180
-#define LOAD_PRESET_RESET 0x000
-#define LOAD_PRESET_DEMO 0x180
diff --git a/Graphic_Equalizer/include/eventhandler_shared.hch b/Graphic_Equalizer/include/eventhandler_shared.hch
index bddf4c6..1d51a3d 100644
--- a/Graphic_Equalizer/include/eventhandler_shared.hch
+++ b/Graphic_Equalizer/include/eventhandler_shared.hch
@@ -58,6 +58,7 @@ typedef struct {
#define IMAGE_ABOUT 0x08
#define IMAGE_GRAPH 0x09
#define IMAGE_AUDIO_PLAYER 0x0a
+#define IMAGE_INPUT_SELECT_TEXT 0x0b
#define EQUALIZERMODE_FULL 0x05
diff --git a/Graphic_Equalizer/include/smartmedia.hch b/Graphic_Equalizer/include/smartmedia.hch
index b183b9d..536044a 100644
--- a/Graphic_Equalizer/include/smartmedia.hch
+++ b/Graphic_Equalizer/include/smartmedia.hch
@@ -33,18 +33,19 @@
/*
* The different stages the smart media loaders knows.
*/
-#define STAGE_LOAD_DEMO_PRESET 0x00
-#define STAGE_LOAD_RESET_PRESET 0x01
-#define STAGE_LOAD_SKIN 0x02
-#define STAGE_LOAD_HELP 0x03
-#define STAGE_LOAD_GRAPH 0x04
-#define STAGE_LOAD_TOP_FONTYS 0x05
-#define STAGE_LOAD_TOP_TASS 0x06
-#define STAGE_LOAD_TOP_TRANSFER 0x07
-#define STAGE_LOAD_TOP_CELOXICA 0x08
-#define STAGE_LOAD_TOP_DETAILS 0x09
-#define STAGE_LOAD_ABOUT_BOTTOM 0x0a
-#define STAGE_LOAD_AUDIO_PLAYER 0x0b
+#define STAGE_LOAD_DEMO_PRESET 0x00
+#define STAGE_LOAD_RESET_PRESET 0x01
+#define STAGE_LOAD_SKIN 0x02
+#define STAGE_LOAD_HELP 0x03
+#define STAGE_LOAD_GRAPH 0x04
+#define STAGE_LOAD_TOP_FONTYS 0x05
+#define STAGE_LOAD_TOP_TASS 0x06
+#define STAGE_LOAD_TOP_TRANSFER 0x07
+#define STAGE_LOAD_TOP_CELOXICA 0x08
+#define STAGE_LOAD_TOP_DETAILS 0x09
+#define STAGE_LOAD_ABOUT_BOTTOM 0x0a
+#define STAGE_LOAD_AUDIO_PLAYER 0x0b
+#define STAGE_LOAD_INPUT_SELECT_TEXT 0x0c
@@ -73,8 +74,6 @@ unsigned 1 smartmedia_loaddata(skindata_t *skindata);
void change_track(unsigned 2 track_index);
-void empty_buffers(signed 18 *buffer, unsigned 7 buffer_size);
-
/*
* This function loads samplecount samples from the smartmedia.
*/
diff --git a/Graphic_Equalizer/include/smartmedia_shared.hch b/Graphic_Equalizer/include/smartmedia_shared.hch
index 0b1790f..091c0f9 100644
--- a/Graphic_Equalizer/include/smartmedia_shared.hch
+++ b/Graphic_Equalizer/include/smartmedia_shared.hch
@@ -38,9 +38,11 @@
#define SIZE_AUDIO_PLAYER_BUTTON 0x0001740 /* Number of pixels */
+#define SIZE_INPUT_SELECT_TEXT 0x00001bd /* Number of pixels */
+
#define SIZE_TRACK1 0x108D500 /* Number of bytes */
-#define SIZE_TRACK2 0x1422300 /* Number of bytes */
-#define SIZE_TRACK3 0x108D500 /* Number of bytes */
+#define SIZE_TRACK2 0x110A0D8 /* Number of bytes */
+#define SIZE_TRACK3 0x1422300 /* Number of bytes */
#define SIZE_PRESET 384 /* Number of elements */
@@ -70,27 +72,31 @@
#define SMARTMEDIA_ADDRESS_AUDIO_PLAYER_START (SMARTMEDIA_ADDRESS_OFFSET +0x41C000) /* Block: 496 */
+#define SMARTMEDIA_ADDRESS_INPUT_SELECT_TEXT_START (SMARTMEDIA_ADDRESS_OFFSET +0x424000) /* Block: 498 */
+
#define SMARTMEDIA_ADDRESS_TRACK1_START (SMARTMEDIA_ADDRESS_OFFSET +0x42C000) /* Block: 500 */
#define SMARTMEDIA_ADDRESS_TRACK2_START (SMARTMEDIA_ADDRESS_OFFSET +0x14BC000) /* Block: 1560 */
-#define SMARTMEDIA_ADDRESS_TRACK3_START (SMARTMEDIA_ADDRESS_OFFSET +0x42C000) /* Block: 500 */
+#define SMARTMEDIA_ADDRESS_TRACK3_START (SMARTMEDIA_ADDRESS_OFFSET +0x25C8000) /* Block: 2651 */
+
+#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_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 << 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_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 << 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_BOTTOM_END (SMARTMEDIA_ADDRESS_BOTTOM_START +(SIZE_ABOUT_BOTTOM <<2))
-#define SMARTMEDIA_ADDRESS_BOTTOM_END (SMARTMEDIA_ADDRESS_BOTTOM_START +(SIZE_ABOUT_BOTTOM <<2))
+#define SMARTMEDIA_ADDRESS_AUDIO_PLAYER_END (SMARTMEDIA_ADDRESS_AUDIO_PLAYER_START +(SIZE_AUDIO_PLAYER_BUTTON <<2))
-#define SMARTMEDIA_ADDRESS_AUDIO_PLAYER_END (SMARTMEDIA_ADDRESS_AUDIO_PLAYER_START +(SIZE_AUDIO_PLAYER_BUTTON <<2))
+#define SMARTMEDIA_ADDRESS_INPUT_SELECT_TEXT_END (SMARTMEDIA_ADDRESS_INPUT_SELECT_TEXT_START +(SIZE_INPUT_SELECT_TEXT <<2))
#define SMARTMEDIA_ADDRESS_TRACK1_END (SMARTMEDIA_ADDRESS_TRACK1_START +SIZE_TRACK1)
#define SMARTMEDIA_ADDRESS_TRACK2_END (SMARTMEDIA_ADDRESS_TRACK2_START +SIZE_TRACK2)
@@ -128,6 +134,8 @@
#define ADDRESS_AUDIO_PLAYER_START 0x0ebb34
#define ADDRESS_AUDIO_PLAYER_END (ADDRESS_AUDIO_PLAYER_START +SIZE_AUDIO_PLAYER_BUTTON)
+#define ADDRESS_INPUT_SELECT_TEXT_START 0x0ed275
+#define ADDRESS_INPUT_SELECT_TEXT_END (ADDRESS_INPUT_SELECT_TEXT_START +SIZE_INPUT_SELECT_TEXT)
#else
#error "ERROR file smartmedia_shared.hch multiple times included"