X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/4bc81323e51ac138e733c14eeb6f283ae706e904..8a7deceacd30529e5c32082b2c719eb055841d0d:/avr/z80-if.c diff --git a/avr/z80-if.c b/avr/z80-if.c index 392597e..9492c28 100644 --- a/avr/z80-if.c +++ b/avr/z80-if.c @@ -54,7 +54,6 @@ */ #include -#include #include #include #include "debug.h" @@ -64,12 +63,6 @@ /* Number of array elements */ #define NELEMS(x) (sizeof x/sizeof *x) - -#define CONCAT(x,y) x ## y -#define EVALUATOR(x,y) CONCAT(x,y) - -#define GPIO_(X) CONCAT(GPIO, X) - struct bits { uint8_t b0:1; uint8_t b1:1; @@ -81,10 +74,14 @@ struct bits { uint8_t b7:1; } __attribute__((__packed__)); -#define SBIT(port,pin) ((*(volatile struct bits*)&port).b##pin) +typedef struct bits pbit_t; +#define SBIT(port,pin) ((*(volatile struct bits*)&port).b##pin) +//#define P_ZCLK PORTB +//#define ZCLK 5 +//#define DDR_ZCLK DDRB #define P_MREQ PORTD #define MREQ 4 #define DDR_MREQ DDRD @@ -128,6 +125,7 @@ struct bits { //#define ADB_PORT PORTE +//#define Z80_O_ZCLK SBIT(P_ZCLK, 5) #define Z80_O_MREQ SBIT(P_MREQ, 4) #define Z80_O_RD SBIT(P_RD, 3) #define Z80_O_WR SBIT(P_WR, 2) @@ -142,7 +140,6 @@ struct bits { #define SMASK(w,s) (MASK(w) << (s)) - typedef union { uint32_t l; uint16_t w[2]; @@ -155,7 +152,7 @@ static zstate_t zstate; /*--------------------------------------------------------------------------*/ -static void z80_setup_addrbus_tristate(void) +static void z80_addrbus_set_tristate(void) { /* /MREQ, /RD, /WR: Input, no pullup */ DDR_MREQ &= ~(_BV(MREQ) | _BV(RD) | _BV(WR)); @@ -171,8 +168,8 @@ static void z80_setup_addrbus_tristate(void) DDR_ADB = DDR_ADB & ~(MASK(ADB_WIDTH) << ADB_SHIFT); } - -static void z80_setup_addrbus_active(void) + +static void z80_addrbus_set_active(void) { /* /MREQ, /RD, /WR: Output and high */ Z80_O_MREQ = 1; @@ -186,14 +183,14 @@ static void z80_setup_addrbus_active(void) } -static void z80_setup_dbus_in(void) +static void z80_dbus_set_in(void) { DDR_DB = 0; P_DB = 0; } -static void z80_setup_dbus_out(void) +static void z80_dbus_set_out(void) { DDR_DB = 0xff; } @@ -225,8 +222,8 @@ void z80_setup_bus(void) DDR_IOCS1 &= ~_BV(IOCS1); P_IOCS1 &= ~_BV(IOCS1); - z80_setup_addrbus_tristate(); - z80_setup_dbus_in(); + z80_addrbus_set_tristate(); + z80_dbus_set_in(); zstate = RESET; } @@ -240,10 +237,10 @@ zstate_t z80_bus_state(void) static void z80_busreq_hpulse(void) { - z80_setup_dbus_in(); - z80_setup_addrbus_tristate(); + z80_dbus_set_in(); + z80_addrbus_set_tristate(); - ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { + ATOMIC_BLOCK(ATOMIC_FORCEON) { Z80_O_BUSREQ = 1; Z80_O_BUSREQ = 1; /* 2 AVR clock cycles */ Z80_O_BUSREQ = 0; /* 2 AVR clock cycles */ @@ -252,7 +249,7 @@ static void z80_busreq_hpulse(void) if (zstate & ZST_ACQUIRED) { while(Z80_I_BUSACK == 1) ; - z80_setup_addrbus_active(); + z80_addrbus_set_active(); } } @@ -291,8 +288,8 @@ zstate_t z80_bus_cmd(bus_cmd_t cmd) switch (cmd) { case Reset: - z80_setup_dbus_in(); - z80_setup_addrbus_tristate(); + z80_dbus_set_in(); + z80_addrbus_set_tristate(); Z80_O_RST = 0; Z80_O_BUSREQ = 1; zstate = RESET; @@ -305,7 +302,7 @@ zstate_t z80_bus_cmd(bus_cmd_t cmd) Z80_O_RST = 1; while(Z80_I_BUSACK == 1) ; - z80_setup_addrbus_active(); + z80_addrbus_set_active(); zstate = RESET_AQRD; break; @@ -313,7 +310,7 @@ zstate_t z80_bus_cmd(bus_cmd_t cmd) Z80_O_BUSREQ = 0; while(Z80_I_BUSACK == 1) ; - z80_setup_addrbus_active(); + z80_addrbus_set_active(); zstate = RUNNING_AQRD; break; @@ -325,15 +322,15 @@ zstate_t z80_bus_cmd(bus_cmd_t cmd) case Release: switch (zstate) { case RESET_AQRD: - z80_setup_dbus_in(); - z80_setup_addrbus_tristate(); + z80_dbus_set_in(); + z80_addrbus_set_tristate(); Z80_O_RST = 0; Z80_O_BUSREQ = 1; zstate = RESET; break; case RUNNING_AQRD: - z80_setup_dbus_in(); - z80_setup_addrbus_tristate(); + z80_dbus_set_in(); + z80_addrbus_set_tristate(); Z80_O_BUSREQ = 1; zstate = RUNNING; break; @@ -350,10 +347,10 @@ zstate_t z80_bus_cmd(bus_cmd_t cmd) break; case RESET_AQRD: - z80_setup_dbus_in(); - z80_setup_addrbus_tristate(); + z80_dbus_set_in(); + z80_addrbus_set_tristate(); z80_reset_pulse(); - z80_setup_addrbus_active(); + z80_addrbus_set_active(); zstate = RUNNING_AQRD; break; default: @@ -387,7 +384,7 @@ zstate_t z80_bus_cmd(bus_cmd_t cmd) /*--------------------------------------------------------------------------*/ -static +static //inline __attribute__ ((always_inline)) void z80_setaddress(uint32_t addr) { @@ -402,7 +399,7 @@ void z80_write(uint32_t addr, uint8_t data) { z80_setaddress(addr); Z80_O_MREQ = 0; - z80_setup_dbus_out(); + z80_dbus_set_out(); P_DB = data; P_DB = data; Z80_O_WR = 0; @@ -417,7 +414,7 @@ uint8_t z80_read(uint32_t addr) z80_setaddress(addr); Z80_O_MREQ = 0; - z80_setup_dbus_in(); + z80_dbus_set_in(); Z80_O_RD = 0; Z80_O_RD = 0; Z80_O_RD = 0; @@ -431,7 +428,7 @@ uint8_t z80_read(uint32_t addr) void z80_memset(uint32_t addr, uint8_t data, uint32_t length) { - z80_setup_dbus_out(); + z80_dbus_set_out(); Z80_O_MREQ = 0; while(length--) { z80_setaddress(addr++); @@ -447,8 +444,8 @@ void z80_memset(uint32_t addr, uint8_t data, uint32_t length) void z80_write_block(const __flash uint8_t *src, uint32_t dest, uint32_t length) { uint8_t data; - - z80_setup_dbus_out(); + + z80_dbus_set_out(); Z80_O_MREQ = 0; while(length--) { z80_setaddress(dest++); @@ -468,7 +465,7 @@ void z80_write_block(const __flash uint8_t *src, uint32_t dest, uint32_t length) 017B' rx.out_idx: ds 1 ; 017C' rx.buf: ds rx.buf_len ; 018B' rx.buf_end equ $-1 ; last byte (start+len-1) - + 018C' tx.bs_mask: ds 1 ; (buf_len - 1) 018D' tx.in_idx: ds 1 ; 018E' tx.out_idx: ds 1 ; @@ -497,22 +494,22 @@ static struct { idx_in, mask; } fifo_dsc[NUM_FIFOS]; - - -void z80_memfifo_init(const fifo_t f, uint32_t adr) -{ -DBG_P(2, "z80_memfifo_init: %i, %lx\n", f, adr); - fifo_dsc[f].base = adr; +void z80_memfifo_init(const fifo_t f, uint32_t addr) +{ + fifo_dsc[f].base = addr; - z80_bus_cmd(Request); + if (addr != 0) { - fifo_dsc[f].mask = z80_read(adr + FIFO_BUFSIZE_MASK); - fifo_dsc[f].idx_in = z80_read(adr + FIFO_INDEX_IN); - fifo_dsc[f].idx_out = z80_read(adr + FIFO_INDEX_OUT); +DBG_P(2, "z80_memfifo_init: %i, %lx\n", f, addr); - z80_bus_cmd(Release); + z80_bus_cmd(Request); + fifo_dsc[f].mask = z80_read(addr + FIFO_BUFSIZE_MASK); + fifo_dsc[f].idx_in = z80_read(addr + FIFO_INDEX_IN); + fifo_dsc[f].idx_out = z80_read(addr + FIFO_INDEX_OUT); + z80_bus_cmd(Release); + } } @@ -537,7 +534,7 @@ int z80_memfifo_is_empty(const fifo_t f) int z80_memfifo_is_full(const fifo_t f) { int rc = 1; - + if (fifo_dsc[f].base != 0) { z80_bus_cmd(Request); rc = ((fifo_dsc[f].idx_in + 1) & fifo_dsc[f].mask) @@ -547,10 +544,11 @@ int z80_memfifo_is_full(const fifo_t f) return rc; } -uint8_t z80_memfifo_getc(const fifo_t f) + +uint8_t z80_memfifo_getc_wait(const fifo_t f) { uint8_t rc, idx; - + while (z80_memfifo_is_empty(f)) ; @@ -560,7 +558,25 @@ uint8_t z80_memfifo_getc(const fifo_t f) fifo_dsc[f].idx_out = ++idx & fifo_dsc[f].mask; z80_write(fifo_dsc[f].base+FIFO_INDEX_OUT, fifo_dsc[f].idx_out); z80_bus_cmd(Release); - + + return rc; +} + +int z80_memfifo_getc(const fifo_t f) +{ + int rc = -1; + + if (fifo_dsc[f].base != 0) { + uint8_t idx = fifo_dsc[f].idx_out; + z80_bus_cmd(Request); + if (idx != z80_read(fifo_dsc[f].base + FIFO_INDEX_IN)) { + rc = z80_read(fifo_dsc[f].base+idx); + fifo_dsc[f].idx_out = ++idx & fifo_dsc[f].mask; + z80_write(fifo_dsc[f].base+FIFO_INDEX_OUT, fifo_dsc[f].idx_out); + } + z80_bus_cmd(Release); + } + return rc; } @@ -568,7 +584,7 @@ uint8_t z80_memfifo_getc(const fifo_t f) void z80_memfifo_putc(fifo_t f, uint8_t val) { int idx; - + while (z80_memfifo_is_full(f)) ; @@ -579,94 +595,3 @@ void z80_memfifo_putc(fifo_t f, uint8_t val) z80_write(fifo_dsc[f].base+FIFO_INDEX_IN, fifo_dsc[f].idx_in); z80_bus_cmd(Release); } - -/*--------------------------------------------------------------------------*/ -/* - TODO: Rewrite msg_fifo routines for AVR -*/ - -static struct { - uint32_t base; - //uint8_t idx_out, idx_in; - uint16_t count; - uint8_t buf[256]; - } msg_fifo; - -/*--------------------------------------------------------------------------*/ - -#if 0 - -static void tim1_setup(void) -{ - RCC_APB2RSTR |= RCC_APB2RSTR_TIM1RST; - RCC_APB2RSTR &= ~RCC_APB2RSTR_TIM1RST; - - TIM1_CR1 = 0; - - TIM1_SMCR = 0 - /* | TIM_SMCR_ETP */ - /* | TIM_SMCR_ETF_CK_INT_N_2 */ - | TIM_SMCR_TS_ETRF - | TIM_SMCR_SMS_OFF - ; - - TIM1_DIER = TIM_DIER_TDE; - - - TIM1_CCMR1 = 0 - | TIM_CCMR1_OC1M_FORCE_LOW - | TIM_CCMR1_CC1S_OUT; - - TIM1_SMCR |= TIM_SMCR_SMS_TM; -} - -#endif - -/*--------------------------------------------------------------------------*/ - -void z80_setup_msg_fifo(void) -{ -// gpio_set_mode(P_BUSACK, GPIO_MODE_INPUT, -// GPIO_CNF_INPUT_FLOAT, GPIO_BUSACK | GPIO_IOCS1); - -//... - -// msg_fifo.count = NELEMS(msg_fifo.buf); - msg_fifo.count = 0; - msg_fifo.base = 0; - -} - - -void z80_init_msg_fifo(uint32_t addr) -{ - -DBG_P(1, "z80_init_msg_fifo: %lx\n", addr); - - z80_bus_cmd(Request); - z80_write(addr+FIFO_INDEX_OUT, z80_read(addr+FIFO_INDEX_IN)); - z80_bus_cmd(Release); - msg_fifo.base = addr; -} - - -int z80_msg_fifo_getc(void) -{ - int c = -1; - -#if 0 - if (msg_fifo.count != (NELEMS(msg_fifo.buf) /*- DMA1_CNDTR4 */ )) { - c = msg_fifo.buf[msg_fifo.count]; - if (++msg_fifo.count == NELEMS(msg_fifo.buf)) - msg_fifo.count = 0; - - if (msg_fifo.base != 0) { - z80_bus_cmd(Request); - z80_write(msg_fifo.base+FIFO_INDEX_OUT, msg_fifo.count); - z80_bus_cmd(Release); - } - } -#endif - - return c; -}