]> cloudbase.mooo.com Git - z180-stamp.git/blobdiff - stm32/z180-stamp-stm32.c
Adaptions for fatfs R0.12b
[z180-stamp.git] / stm32 / z180-stamp-stm32.c
index 284fc8f3076809c9e7a01a4b42d4311b38850867..888494d16a3e588db6b3d736a72a8f077ce072f0 100644 (file)
@@ -1,4 +1,7 @@
 /*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <stdio.h>
@@ -86,26 +89,26 @@ static void clock_setup(void)
 
        /* Enable clocks for:
                GPIO port A (for GPIO_USART1_TX and Button)
-               GPIO port C (LEDs) 
+               GPIO port C (LEDs)
                USART1
-               TIM16 (RST-Pin) 
+               TIM16 (RST-Pin)
                TIM1  (IOCS1)
        */
-       rcc_peripheral_enable_clock(&RCC_APB2ENR, 
-                         RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN 
-                       | RCC_APB2ENR_IOPCEN | RCC_APB2ENR_IOPDEN 
+       rcc_peripheral_enable_clock(&RCC_APB2ENR,
+                         RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN
+                       | RCC_APB2ENR_IOPCEN | RCC_APB2ENR_IOPDEN
                        | RCC_APB2ENR_USART1EN | RCC_APB2ENR_AFIOEN
                        | RCC_APB2ENR_TIM1EN | RCC_APB2ENR_TIM16EN);
        /* Enable clocks for:
                TIM3
        */
-       rcc_peripheral_enable_clock(&RCC_APB1ENR, 
+       rcc_peripheral_enable_clock(&RCC_APB1ENR,
                        RCC_APB1ENR_TIM3EN);
 
        /* Enable clocks for:
                DMA1
        */
-       rcc_peripheral_enable_clock(&RCC_AHBENR, 
+       rcc_peripheral_enable_clock(&RCC_AHBENR,
                        RCC_AHBENR_DMA1EN);
 }
 
@@ -129,19 +132,19 @@ static void nvic_setup(void)
 static void tim3_setup(void)
 {
        TIM3_CR1 = TIM_CR1_CMS_EDGE | TIM_CR1_DIR_UP;
-               
+
        TIM3_CCMR2 = 0
-               | TIM_CCMR2_OC4M_FORCE_LOW      
+               | TIM_CCMR2_OC4M_FORCE_LOW
        /*      | TIM_CCMR2_OC4M_FORCE_HIGH     */
        /*      | TIM_CCMR2_OC4M_PWM2           */
-               
+
        /*      | TIM_CCMR2_OC4PE               */
        /*      | TIM_CCMR2_OC4FE               */
                | TIM_CCMR2_CC4S_OUT;
-               
+
        TIM3_CCER = TIM_CCER_CC4E
                | TIM_CCER_CC4P;
-       
+
        TIM3_ARR = 48;  /* default */
        TIM3_CCR4 = 1;  /*  */
 }
@@ -154,7 +157,7 @@ static void gpio_setup(void)
           Remap TIM3 (CH1/PC6, CH2/PC7, CH3/PC8, CH4/PC9)
           Port D0/Port D1 mapping on OSC_IN/OSC_OUT
        */
-       gpio_primary_remap(AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON, 
+       gpio_primary_remap(AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON,
                        AFIO_MAPR_SPI1_REMAP
                        | AFIO_MAPR_TIM3_REMAP_FULL_REMAP
                        | AFIO_MAPR_PD01_REMAP);
@@ -174,7 +177,7 @@ static void gpio_setup(void)
 void delay_systicks(int ticks)
 {
        int start, stop, now;
-       
+
        start = STK_CVR;
        stop = start - ticks;
        if (stop < 0) {
@@ -298,13 +301,13 @@ static void key_timerproc() {
 //     key_state = key_state  & key_in      | (key_state  | key_in)      & key_in_last;
 
        key_state = c | ((key_in_last | key_in) & key_state);
-               
+
 //     key_state = (key_state&key_in_last) | (key_state&key_in) | (key_in_last&key_in);
 
        key_press |= c;
-       
+
        key_in_last = key_in;
-       
+
 
        if ((key_state & REPEAT_MASK) == 0) // check repeat function
                rpt = REPEAT_START;
@@ -319,10 +322,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)
@@ -330,7 +333,7 @@ void sys_tick_handler(void)
                Stat |= S_10MS_TO;
 
                tick_10ms = 0;
-               
+
                i = led_timer[0];
                if (i)
                        led_timer[0] = i - 1;
@@ -339,11 +342,11 @@ void sys_tick_handler(void)
                        led_timer[1] = i - 1;
 
                key_timerproc();
-               
+
                /* Drive timer procedure of low level disk I/O module */
                //disk_timerproc();
        }
-       
+
        count_ms++;
        if (count_ms == 1000) {
                count_ms = 0;
@@ -366,7 +369,7 @@ void rtc_isr(void)
 void tim3_set(int mode)
 {
        uint16_t cc_mode;
-       
+
        cc_mode = TIM_CCMR2_CC4S_OUT;
 
        TIM3_CR1 = TIM_CR1_CMS_EDGE | TIM_CR1_DIR_UP /*| TIM_CR1_OPM */ ;
@@ -380,30 +383,30 @@ void tim3_set(int mode)
                TIM3_CCR4 = mode/2;
                cc_mode |= TIM_CCMR2_OC4M_PWM2;
        }
-                       
+
        TIM3_CCMR2 = cc_mode;
-               
+
        if (mode > 0)
                TIM3_CR1 |= TIM_CR1_CEN;
 }
 
 /*--------------------------------------------------------------------------*/
 
-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--) {
                if ((rval = z80_read(addr)) != wval) {
-                       if (errors == 0) { 
+                       if (errors == 0) {
                                printf("\nSRAM: Address  W  R\n" \
                                       "      -------------\n");
 //                                            12345  00 11
                        }
                        printf("       %.5lx  %.2x %.2x\n", addr, wval, rval);
-                       
+
                        if (++errors > 16 )
                                break;
                }
@@ -421,7 +424,7 @@ static void z80_sram_fill(uint32_t addr, int length, uint8_t startval, int inc)
        printf("SRAM: Write %#.5x byte... ", length); //fflush(stdout);
        while (length--) {
                z80_write(addr, startval);
-               ++addr; 
+               ++addr;
                startval += inc;
        }
        printf("Done.\n");
@@ -465,18 +468,18 @@ const char * const qbcat = "Zhe quick brown fox jumps over the lazy cat!";
 uint8_t z80_get_byte(uint32_t adr)
 {
        uint8_t data;
-       
+
        z80_request_bus();
        data = z80_read(adr),
        z80_release_bus();
-       
+
        return data;
 }
 
 
 /*--------------------------------------------------------------------------*/
 
-static void do_10ms(void) 
+static void do_10ms(void)
 {
        for (uint_fast8_t i = 0; i < 2; i++) {
                switch (led_stat[i].mode) {
@@ -510,7 +513,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;
 
@@ -543,8 +546,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,
@@ -564,7 +567,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++;
@@ -608,7 +611,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];
 
@@ -645,12 +648,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],
@@ -668,11 +670,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();
@@ -692,7 +690,7 @@ int main(void)
         * Otherwise enable it with the LSE as clock source and 0x7fff as
         * prescale value.
         */
-       rtc_auto_awake(LSE, 0x7fff);
+       rtc_auto_awake(RCC_LSE, 0x7fff);
 
        systick_setup();
 
@@ -701,19 +699,19 @@ int main(void)
        z80_reset(HIGH);
        z80_request_bus();
        DBG_P(1, "got it!\n");
-       
+
        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);
        DBG_P(1, "Bus released!\n");
        z80_release_bus();
        z80_reset(HIGH);
        DBG_P(1, "Reset released!\n");
-       
-       
+
+
        ledset(0, BLINK1, 50);
 
        while (1) {