use stdint/stdbool

1 files changed, 41 insertions, 41 deletions

diff --git a/source/sa1.h b/source/sa1.h
index 740d615..92345df 100644
--- a/source/sa1.h
+++ b/source/sa1.h
@@ -95,55 +95,55 @@
 
 typedef struct
 {
-   uint8   PB;
-   uint8   DB;
+   uint8_t   PB;
+   uint8_t   DB;
    pair    P;
    pair    A;
    pair    D;
    pair    S;
    pair    X;
    pair    Y;
-   uint16  PC;
+   uint16_t  PC;
 } SSA1Registers;
 
 typedef struct
 {
    SOpcodes* S9xOpcodes;
-   uint8   _Carry;
-   uint8   _Zero;
-   uint8   _Negative;
-   uint8   _Overflow;
-   bool8   CPUExecuting;
-   uint32  ShiftedPB;
-   uint32  ShiftedDB;
-   uint32  Flags;
-   bool8   Executing;
-   bool8   NMIActive;
-   bool8   IRQActive;
-   bool8   WaitingForInterrupt;
-   bool8   Waiting;
-   //    uint8   WhichEvent;
-   uint8*   PC;
-   uint8*   PCBase;
-   uint8*   BWRAM;
-   uint8*   PCAtOpcodeStart;
-   uint8*   WaitAddress;
-   uint32  WaitCounter;
-   uint8*   WaitByteAddress1;
-   uint8*   WaitByteAddress2;
+   uint8_t   _Carry;
+   uint8_t   _Zero;
+   uint8_t   _Negative;
+   uint8_t   _Overflow;
+   bool   CPUExecuting;
+   uint32_t  ShiftedPB;
+   uint32_t  ShiftedDB;
+   uint32_t  Flags;
+   bool   Executing;
+   bool   NMIActive;
+   bool   IRQActive;
+   bool   WaitingForInterrupt;
+   bool   Waiting;
+   //    uint8_t   WhichEvent;
+   uint8_t*   PC;
+   uint8_t*   PCBase;
+   uint8_t*   BWRAM;
+   uint8_t*   PCAtOpcodeStart;
+   uint8_t*   WaitAddress;
+   uint32_t  WaitCounter;
+   uint8_t*   WaitByteAddress1;
+   uint8_t*   WaitByteAddress2;
    //    long    Cycles;
    //    long    NextEvent;
    //    long    V_Counter;
-   uint8*   Map [MEMMAP_NUM_BLOCKS];
-   uint8*   WriteMap [MEMMAP_NUM_BLOCKS];
-   int16   op1;
-   int16   op2;
+   uint8_t*   Map [MEMMAP_NUM_BLOCKS];
+   uint8_t*   WriteMap [MEMMAP_NUM_BLOCKS];
+   int16_t   op1;
+   int16_t   op2;
    int     arithmetic_op;
-   int64   sum;
-   bool8   overflow;
-   uint8   VirtualBitmapFormat;
-   bool8   in_char_dma;
-   uint8   variable_bit_pos;
+   int64_t   sum;
+   bool   overflow;
+   uint8_t   VirtualBitmapFormat;
+   bool   in_char_dma;
+   uint8_t   variable_bit_pos;
    SSA1Registers Registers;
 } SSA1;
 
@@ -162,13 +162,13 @@ typedef struct
 #define SA1CheckFlag(f)  (SA1.Registers.PL & (f))
 
 
-uint8 S9xSA1GetByte(uint32);
-uint16 S9xSA1GetWord(uint32);
-void S9xSA1SetByte(uint8, uint32);
-void S9xSA1SetWord(uint16, uint32);
-void S9xSA1SetPCBase(uint32);
-uint8 S9xGetSA1(uint32);
-void S9xSetSA1(uint8, uint32);
+uint8_t S9xSA1GetByte(uint32_t);
+uint16_t S9xSA1GetWord(uint32_t);
+void S9xSA1SetByte(uint8_t, uint32_t);
+void S9xSA1SetWord(uint16_t, uint32_t);
+void S9xSA1SetPCBase(uint32_t);
+uint8_t S9xGetSA1(uint32_t);
+void S9xSetSA1(uint8_t, uint32_t);
 
 extern SOpcodes S9xSA1OpcodesM1X1 [256];
 extern SOpcodes S9xSA1OpcodesM1X0 [256];