Revert "Refactro Tupfiles"

[z180-stamp.git] / stm32 / z180-stamp-stm32.c

diff --git a/stm32/z180-stamp-stm32.c b/stm32/z180-stamp-stm32.c
index 1d5df34c797cf69dd57822fdac377a3f077986b1..15d732d26733f75fbdc6875cb2c62f2e43eff700 100644 (file)
--- a/stm32/z180-stamp-stm32.c
+++ b/stm32/z180-stamp-stm32.c
@@ -18,8 +18,7 @@
 #include "debug.h"
 #include "serial.h"
 #include "z80-if.h"
-#include "../Z180/hdrom.h"
-
+#include "../z180/hdrom.h"
 
 #define ESCCHAR                ('^'-0x40)
 
@@ -320,10 +319,10 @@ static void key_timerproc() {
 
 void sys_tick_handler(void)
 {
-       static int tick_10ms = 0;
-       static int count_ms = 0;
+       static int_fast8_t tick_10ms = 0;
+       static int_fast16_t count_ms = 0;
 
-       int i;
+       int_fast8_t i;
 
        ++tick_10ms;
        if (tick_10ms == 10)
@@ -390,10 +389,10 @@ void tim3_set(int mode)
 
 /*--------------------------------------------------------------------------*/
 
-static uint32_t z80_sram_cmp(uint32_t addr, int length, uint8_t wval, int inc)
+static uint32_t z80_sram_cmp(uint32_t addr, uint32_t length, uint8_t wval, int inc)
 {
        uint8_t rval;
-       int errors = 0;
+       int_fast8_t errors = 0;
        
        DBG_P(1, "SRAM: Check %#.5x byte... ", length);
        while (length--) {
@@ -511,7 +510,7 @@ struct msg_item {
 
 uint32_t msg_to_addr(uint8_t *msg)
 {
-       uint32_t addr = msg[0] + (msg[1] << 8) + (msg[2] << 16);
+       uint32_t addr = msg[0] | (msg[1] << 8) | ((uint32_t)msg[2] << 16);
 
        return addr;
 
@@ -544,8 +543,8 @@ void do_msg_char_out(uint8_t subf, int len, uint8_t * msg)
 
 const struct msg_item z80_messages[] =
 {
-       { 0,
-         0, 0,
+       { 0,                    /* fct nr. */
+         0, 0,                 /* sub fct nr. from, to */
          &do_msg_ini_msgfifo},
        { 0,
          1, 2,
@@ -565,7 +564,7 @@ const struct msg_item z80_messages[] =
 void do_message(int len, uint8_t *msg)
 {
        uint8_t fct, sub_fct;
-       int i = 0;
+       int_fast8_t i = 0;
 
        if (len >= 2) {
                fct = *msg++;
@@ -609,7 +608,7 @@ void do_message(int len, uint8_t *msg)
 void check_msg_fifo(void)
 {
        int ch;
-       static int state;
+       static int_fast8_t state;
        static int msglen,idx;
        static uint8_t buffer[CTRBUF_LEN];
 
@@ -646,12 +645,11 @@ void check_msg_fifo(void)
 
 void z80_load_mem(void)
 {
-
-DBG_P(1, "Loading z80 memory... \n");
-
        unsigned sec = 0;
        uint32_t sec_base = hdrom_start;
 
+       DBG_P(1, "Loading z80 memory... \n");
+
        while (sec < hdrom_sections) {
                DBG_P(2, "  From: 0x%.5lX to: 0x%.5lX    (%5li bytes)\n",
                                hdrom_address[sec],
@@ -669,11 +667,7 @@ DBG_P(1, "Loading z80 memory... \n");
 
 int main(void)
 {
-       //uint32_t led_state = LED_BLUE_PIN;
-       //uint32_t rc;
-       //uint8_t startval = 0;
-       //int count;
-       int state = 0;
+       int_fast8_t state = 0;
        int ch;
 
        clock_setup();
@@ -705,7 +699,7 @@ int main(void)
        
        z80_memset(0, 0x76, 0x80000);
        //z80_sram_fill(0, 512 * 1024, 0x76, 0);
-       z80_sram_cmp(0, 512 * 1024, 0x76, 0);
+       z80_sram_cmp(0, (uint32_t)512 * 1024, 0x76, 0);
        
        z80_load_mem();
        z80_reset(LOW);