cleanup

[z180-stamp.git] / include / z80-if.h

diff --git a/include/z80-if.h b/include/z80-if.h
index 5153f37974c412e1102477da5a8626ae52c91d99..24fda5d80f086c2365bc5f7d881a673adbd96aa4 100644 (file)
--- a/include/z80-if.h
+++ b/include/z80-if.h
@@ -26,8 +26,6 @@ void z80_setup_bus(void);
 int z80_stat_reset(void);
 //void z80_busreq(level_t level);
 int z80_stat_halt(void);
-uint32_t z80_clock_get(void);
-int z80_clock_set(unsigned long freq);
 
 
 void z80_write(uint32_t addr, uint8_t data);
@@ -36,14 +34,16 @@ 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);
 
 
-typedef enum fifo_t {fifo_in, fifo_out, NUM_FIFOS} fifo_t;
+typedef enum fifo_t {
+               fifo_msgin, fifo_msgout, 
+               fifo_conout, fifo_conin,
+               NUM_FIFOS
+       } fifo_t;
 
 void z80_memfifo_init(const fifo_t f, uint32_t adr);
 int z80_memfifo_is_empty(const fifo_t f);
 int z80_memfifo_is_full(const fifo_t f);
-uint8_t z80_memfifo_getc(const fifo_t f);
+int z80_memfifo_getc(const fifo_t f);
+uint8_t z80_memfifo_getc_wait(const fifo_t f);
 void z80_memfifo_putc(fifo_t f, uint8_t val);
 
-void z80_setup_msg_fifo(void);
-void z80_init_msg_fifo(uint32_t addr);
-int z80_msg_fifo_getc(void);