updated EEPROM code, gmv fixed

[picodrive.git] / Pico / PicoInt.h

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index 7af451c..6105f61 100644 (file)
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -171,9 +171,9 @@ struct PicoMisc
   unsigned char  z80_fakeval;\r
   unsigned char  pad0;\r
   unsigned char  padDelay[2];  // 10 gamepad phase time outs, so we count a delay\r
-  unsigned short sram_addr;  // EEPROM address register\r
-  unsigned char sram_cycle;  // EEPROM SRAM cycle number\r
-  unsigned char sram_slave;  // EEPROM slave word for X24C02 and better SRAMs\r
+  unsigned short eeprom_addr;  // EEPROM address register\r
+  unsigned char  eeprom_cycle; // EEPROM SRAM cycle number\r
+  unsigned char  eeprom_slave; // EEPROM slave word for X24C02 and better SRAMs\r
   unsigned char prot_bytes[2]; // simple protection faking\r
   unsigned short dma_xfers;\r
   unsigned char pad[2];\r
@@ -204,10 +204,14 @@ struct PicoSRAM
   unsigned char *data;         // actual data\r
   unsigned int start;          // start address in 68k address space\r
   unsigned int end;\r
-  unsigned char resize;                // 0c: 1=SRAM size changed and needs to be reallocated on PicoReset\r
-  unsigned char reg_back;      // copy of Pico.m.sram_reg to set after reset\r
+  unsigned char unused1;       // 0c: unused\r
+  unsigned char unused2;\r
   unsigned char changed;\r
-  unsigned char pad;\r
+  unsigned char eeprom_type;    // eeprom type: 0: 7bit (24C01), 2: device with 2 addr words (X24C02+), 3: dev with 3 addr words\r
+  unsigned char eeprom_abits;  // eeprom access must be odd addr for: bit0 ~ cl, bit1 ~ out\r
+  unsigned char eeprom_bit_cl; // bit number for cl\r
+  unsigned char eeprom_bit_in;  // bit number for in\r
+  unsigned char eeprom_bit_out; // bit number for out\r
 };\r
 \r
 // MCD\r
@@ -291,6 +295,9 @@ PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub);
 PICO_INTERNAL int PicoCdSaveState(void *file);\r
 PICO_INTERNAL int PicoCdLoadState(void *file);\r
 \r
+// Cart.c\r
+PICO_INTERNAL void PicoCartDetect(void);\r
+\r
 // Draw.c\r
 PICO_INTERNAL int PicoLine(int scan);\r
 PICO_INTERNAL void PicoFrameStart(void);\r
@@ -397,6 +404,10 @@ PICO_INTERNAL void z80_exit(void);
 #define EL_VDPDMA  0x0040 /* VDP DMA transfers and their timing */\r
 #define EL_BUSREQ  0x0080 /* z80 busreq r/w */\r
 #define EL_Z80BNK  0x0100 /* z80 i/o through bank area */\r
+#define EL_SRAMIO  0x0200 /* sram i/o */\r
+#define EL_EEPROM  0x0400 /* eeprom debug */\r
+#define EL_UIO     0x0800 /* unmapped i/o */\r
+#define EL_IO      0x1000 /* all i/o */\r
 \r
 #define EL_STATUS  0x4000 /* status messages */\r
 #define EL_ANOMALY 0x8000 /* some unexpected conditions */\r