Re-Changed macro's to functions.

5 files changed, 8 insertions, 8 deletions

diff --git a/Graphic_Equalizer/include/display.hch b/Graphic_Equalizer/include/display.hch
index dcc0105..3e6ebf2 100644
--- a/Graphic_Equalizer/include/display.hch
+++ b/Graphic_Equalizer/include/display.hch
@@ -26,7 +26,7 @@
  */

 #define PIXEL_VOLUME		(0x0000ff)

 #define PIXEL_EQUALIZER		(0xff0000)

-#define PIXEL_SPECTRUM		((((skindata.area_spectrum_bottom -(SCANY <- 10)) <<1) <- 8) @ 0x00 @ (((skindata.area_spectrum_bottom -(SCANY <- 10)) <<1) <- 8))

+#define PIXEL_SPECTRUM		((((skindata->area_spectrum_bottom -(SCANY <- 10)) <<1) <- 8) @ 0x00 @ (((skindata->area_spectrum_bottom -(SCANY <- 10)) <<1) <- 8))

 #define PIXEL_WAVEFORM		(0x0000ff)

 

 

@@ -37,14 +37,14 @@
  * informs events what the current mask is. To optain the current mask we need

  * the X and Y coordinates from our mousedata pointer.

  */

-macro proc display_main(skindata, audiodata, events, mousedata, CLOCKRATE, VIDEOOUT, RAM_BANK0);

+void display_main(skindata_t *skindata, audiodata_t *audiodata, events_t *events, mousedata_t *mousedata);

 

 

 

 /*

  * reload equalizer bars into the display memory.

  */

-macro proc reload_equalizer(events, equalizer_levels, preset_offset);

+void reload_equalizer(events_t *events, unsigned 4 *equalizer_levels, unsigned 10 preset_offset);

 

 #else

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

diff --git a/Graphic_Equalizer/include/eventhandler.hch b/Graphic_Equalizer/include/eventhandler.hch
index 53e6f63..772e686 100644
--- a/Graphic_Equalizer/include/eventhandler.hch
+++ b/Graphic_Equalizer/include/eventhandler.hch
@@ -27,7 +27,7 @@
  * to store actions to be performed and a mousedata pointer so that we know on

  * what mousestate to respond. We never returns!

  */

-macro proc eventhandler_main(audiodata, events, mousedata);

+void eventhandler_main(audiodata_t *audiodata, events_t *events, mousedata_t *mousedata);

 

 #else

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

diff --git a/Graphic_Equalizer/include/events.hch b/Graphic_Equalizer/include/events.hch
index 9d7ac82..0f43841 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.

  */

-macro proc load_preset(preset_address, equalizer_levels);

+void load_preset(unsigned 20 preset_address, unsigned 4 *equalizer_levels);

 

 #else

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

diff --git a/Graphic_Equalizer/include/mouse.hch b/Graphic_Equalizer/include/mouse.hch
index b602d05..f6ae164 100644
--- a/Graphic_Equalizer/include/mouse.hch
+++ b/Graphic_Equalizer/include/mouse.hch
@@ -33,7 +33,7 @@
  * updates the shared memory and notifies listeners. It requires a pointer to

  * a mousedata_t struct to store mouse information.

  */

-macro proc mouse_main(mousedata);

+void mouse_main(mousedata_t *mousedata);

 

 #else

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

diff --git a/Graphic_Equalizer/include/smartmedia.hch b/Graphic_Equalizer/include/smartmedia.hch
index 9bbd2b1..7499292 100644
--- a/Graphic_Equalizer/include/smartmedia.hch
+++ b/Graphic_Equalizer/include/smartmedia.hch
@@ -50,14 +50,14 @@
  * Initializes the smartmedia device.

  */

 

-macro proc smartmedia_init(result);

+unsigned 1 smartmedia_init(void);

 

 

 

 /*

  * This function loads the memory with data from the smartmedia card.

  */

-macro proc smartmedia_loaddata(skindata, RAM_BANK0);

+void smartmedia_loaddata(skindata_t *skindata);

 

 #else

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