X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fcommon%2Fmemory.h;h=2a15cc9ddf4e80a22b6b84f2473c957bcac9a2a2;hb=9cd867c94aabb48f44658a7a4d6832115c876b74;hp=5ba5204df12f367a9cbed7d12e7bd5bcac2baba2;hpb=5419d1bd9d2faae98c78da740634b972e8f5aac1;p=emu8051.git

diff --git a/src/common/memory.h b/src/common/memory.h
index 5ba5204..2a15cc9 100644
--- a/src/common/memory.h
+++ b/src/common/memory.h
@@ -10,7 +10,7 @@
 #ifndef MEMORY_H
 #define MEMORY_H 1
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #define PGM_MEM_MAX_SIZE 65536
 /*
@@ -35,35 +35,56 @@ enum mem_id_t {
 #define DISPLAY_ERROR_YES 1
 
 void
-memory_init(void);
+mem_init(void);
 
 int
-memory_check_address(enum mem_id_t id, unsigned long address,
-		     int display_error);
+mem_check_address(enum mem_id_t id, unsigned long address, int display_error);
 
-u_int8_t *
-memory_getbuf(enum mem_id_t id, unsigned long address);
+void
+mem_convert_bit_address(uint8_t bit_address, uint8_t *byte_address,
+			uint8_t *bit_number);
+
+uint8_t *
+mem_getbuf(enum mem_id_t id, unsigned long address);
+
+void
+mem_clear(enum mem_id_t id);
+
+void
+mem_write8(enum mem_id_t id, unsigned long address, uint8_t value);
+
+void
+mem_write_direct(unsigned int address, unsigned char value);
 
 void
-memory_clear(enum mem_id_t id);
+mem_write_indirect(unsigned int address, unsigned char value);
 
 void
-memory_write8(enum mem_id_t id, unsigned long address, u_int8_t value);
+mem_write_bit(uint8_t bit_address, uint8_t value);
 
 void
-memory_sfr_write8(unsigned long address, u_int8_t value);
+mem_sfr_write8(unsigned long address, uint8_t value);
 
 void
-memory_sfr_write_dptr(u_int16_t value);
+mem_sfr_write_dptr(uint16_t value);
+
+uint8_t
+mem_read8(enum mem_id_t id, unsigned long address);
+
+unsigned char
+mem_read_direct(unsigned int address);
 
-u_int8_t
-memory_read8(enum mem_id_t id, unsigned long address);
+unsigned char
+mem_read_indirect(unsigned int address);
 
-u_int8_t
-memory_sfr_read8(unsigned long address);
+unsigned char
+mem_read_bit(uint8_t bit_address);
 
-u_int16_t
-memory_sfr_read_dptr(void);
+uint8_t
+mem_sfr_read8(unsigned long address);
+
+uint16_t
+mem_sfr_read_dptr(void);
 
 void
 stack_push8(uint8_t value);
@@ -81,6 +102,6 @@ uint16_t
 pgm_read_addr16(uint16_t base);
 
 void
-memory_dump(unsigned int address, int size, int memory_id);
+mem_dump(unsigned int address, int size, enum mem_id_t id);
 
 #endif /* MEMORY_H */