Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-02-03 23:33:39 +00:00
Code Issues Projects Releases Wiki Activity

Refactor : BYTE -> uint8_t

Browse Source
This commit is contained in:
Aaron Culliney 2015-06-07 11:39:01 -07:00
parent 6d252b0b3e
commit 57cd12f1cc
5 changed files with 65 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio/AY8910.c
View File

@ -968,7 +968,7 @@ sound_beeper( int is_tape, int on )
} }
#endif #endif
BYTE* GetAYRegsPtr(struct CAY8910 *_this) uint8_t* GetAYRegsPtr(struct CAY8910 *_this)
{ {
return &(_this->sound_ay_registers[0]); return &(_this->sound_ay_registers[0]);
} }
@ -1038,7 +1038,7 @@ void AY8910_InitClock(int nClock)
} }
} }
BYTE* AY8910_GetRegsPtr(UINT uChip) uint8_t* AY8910_GetRegsPtr(UINT uChip)
{ {
if(uChip >= MAX_8910) if(uChip >= MAX_8910)
return NULL; return NULL;

4
src/audio/AY8910.h
View File

@ -24,7 +24,7 @@ void AY8910Update(int chip, int16_t** buffer, int nNumSamples);
void AY8910_InitAll(int nClock, int nSampleRate); void AY8910_InitAll(int nClock, int nSampleRate);
void AY8910_InitClock(int nClock); void AY8910_InitClock(int nClock);
BYTE* AY8910_GetRegsPtr(UINT uChip); uint8_t* AY8910_GetRegsPtr(UINT uChip);
void AY8910UpdateSetCycles(); void AY8910UpdateSetCycles();
@ -53,7 +53,7 @@ struct CAY8910;
void sound_ay_write(struct CAY8910 *_this, int reg, int val, libspectrum_dword now); void sound_ay_write(struct CAY8910 *_this, int reg, int val, libspectrum_dword now);
void sound_ay_reset(struct CAY8910 *_this); void sound_ay_reset(struct CAY8910 *_this);
void sound_frame(struct CAY8910 *_this); void sound_frame(struct CAY8910 *_this);
BYTE* GetAYRegsPtr(struct CAY8910 *_this); uint8_t* GetAYRegsPtr(struct CAY8910 *_this);
void SetCLK(double CLK); void SetCLK(double CLK);
//private: //private:

82
src/audio/mockingboard.c
View File

@ -125,9 +125,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
typedef struct typedef struct
{ {
SY6522 sy6522; SY6522 sy6522;
BYTE nAY8910Number; uint8_t nAY8910Number;
BYTE nAYCurrentRegister; uint8_t nAYCurrentRegister;
BYTE nTimerStatus; uint8_t nTimerStatus;
SSI263A SpeechChip; SSI263A SpeechChip;
} SY6522_AY8910; } SY6522_AY8910;
@ -201,7 +201,7 @@ static bool g_bMBAvailable = false;
static SS_CARDTYPE g_SoundcardType = CT_Empty; // Use CT_Empty to mean: no soundcard static SS_CARDTYPE g_SoundcardType = CT_Empty; // Use CT_Empty to mean: no soundcard
static bool g_bPhasorEnable = false; static bool g_bPhasorEnable = false;
static BYTE g_nPhasorMode = 0; // 0=Mockingboard emulation, 1=Phasor native static uint8_t g_nPhasorMode = 0; // 0=Mockingboard emulation, 1=Phasor native
//------------------------------------- //-------------------------------------
@ -267,7 +267,7 @@ static void* SSI263Thread(LPVOID);
#else #else
static DWORD SSI263Thread(LPVOID); static DWORD SSI263Thread(LPVOID);
#endif #endif
static void Votrax_Write(BYTE nDevice, BYTE nValue); static void Votrax_Write(uint8_t nDevice, uint8_t nValue);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -316,7 +316,7 @@ static void ResetSY6522(SY6522_AY8910* pMB)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void AY8910_Write(BYTE nDevice, BYTE nReg, BYTE nValue, BYTE nAYDevice) static void AY8910_Write(uint8_t nDevice, uint8_t nReg, uint8_t nValue, uint8_t nAYDevice)
{ {
g_bMB_RegAccessedFlag = true; g_bMB_RegAccessedFlag = true;
SY6522_AY8910* pMB = &g_MB[nDevice]; SY6522_AY8910* pMB = &g_MB[nDevice];
@ -398,7 +398,7 @@ static void UpdateIFR(SY6522_AY8910* pMB)
} }
} }
static void SY6522_Write(BYTE nDevice, BYTE nReg, BYTE nValue) static void SY6522_Write(uint8_t nDevice, uint8_t nReg, uint8_t nValue)
{ {
g_bMB_Active = true; g_bMB_Active = true;
@ -527,13 +527,13 @@ static void SY6522_Write(BYTE nDevice, BYTE nReg, BYTE nValue)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static BYTE SY6522_Read(BYTE nDevice, BYTE nReg) static uint8_t SY6522_Read(uint8_t nDevice, uint8_t nReg)
{ {
// g_bMB_RegAccessedFlag = true; // g_bMB_RegAccessedFlag = true;
g_bMB_Active = true; g_bMB_Active = true;
SY6522_AY8910* pMB = &g_MB[nDevice]; SY6522_AY8910* pMB = &g_MB[nDevice];
BYTE nValue = 0x00; uint8_t nValue = 0x00;
switch (nReg) switch (nReg)
{ {
@ -604,38 +604,38 @@ void SSI263_Play(unsigned int nPhoneme);
#if 0 #if 0
typedef struct typedef struct
{ {
BYTE DurationPhonome; uint8_t DurationPhonome;
BYTE Inflection; // I10..I3 uint8_t Inflection; // I10..I3
BYTE RateInflection; uint8_t RateInflection;
BYTE CtrlArtAmp; uint8_t CtrlArtAmp;
BYTE FilterFreq; uint8_t FilterFreq;
// //
BYTE CurrentMode; uint8_t CurrentMode;
} SSI263A; } SSI263A;
#endif #endif
//static SSI263A nSpeechChip; //static SSI263A nSpeechChip;
// Duration/Phonome // Duration/Phonome
const BYTE DURATION_MODE_MASK = 0xC0; const uint8_t DURATION_MODE_MASK = 0xC0;
const BYTE PHONEME_MASK = 0x3F; const uint8_t PHONEME_MASK = 0x3F;
const BYTE MODE_PHONEME_TRANSITIONED_INFLECTION = 0xC0; // IRQ active const uint8_t MODE_PHONEME_TRANSITIONED_INFLECTION = 0xC0; // IRQ active
const BYTE MODE_PHONEME_IMMEDIATE_INFLECTION = 0x80; // IRQ active const uint8_t MODE_PHONEME_IMMEDIATE_INFLECTION = 0x80; // IRQ active
const BYTE MODE_FRAME_IMMEDIATE_INFLECTION = 0x40; // IRQ active const uint8_t MODE_FRAME_IMMEDIATE_INFLECTION = 0x40; // IRQ active
const BYTE MODE_IRQ_DISABLED = 0x00; const uint8_t MODE_IRQ_DISABLED = 0x00;
// Rate/Inflection // Rate/Inflection
const BYTE RATE_MASK = 0xF0; const uint8_t RATE_MASK = 0xF0;
const BYTE INFLECTION_MASK_H = 0x08; // I11 const uint8_t INFLECTION_MASK_H = 0x08; // I11
const BYTE INFLECTION_MASK_L = 0x07; // I2..I0 const uint8_t INFLECTION_MASK_L = 0x07; // I2..I0
// Ctrl/Art/Amp // Ctrl/Art/Amp
const BYTE CONTROL_MASK = 0x80; const uint8_t CONTROL_MASK = 0x80;
const BYTE ARTICULATION_MASK = 0x70; const uint8_t ARTICULATION_MASK = 0x70;
const BYTE AMPLITUDE_MASK = 0x0F; const uint8_t AMPLITUDE_MASK = 0x0F;
static BYTE SSI263_Read(BYTE nDevice, BYTE nReg) static uint8_t SSI263_Read(uint8_t nDevice, uint8_t nReg)
{ {
SY6522_AY8910* pMB = &g_MB[nDevice]; SY6522_AY8910* pMB = &g_MB[nDevice];
@ -645,7 +645,7 @@ static BYTE SSI263_Read(BYTE nDevice, BYTE nReg)
return pMB->SpeechChip.CurrentMode << 7; return pMB->SpeechChip.CurrentMode << 7;
} }
static void SSI263_Write(BYTE nDevice, BYTE nReg, BYTE nValue) static void SSI263_Write(uint8_t nDevice, uint8_t nReg, uint8_t nValue)
{ {
SY6522_AY8910* pMB = &g_MB[nDevice]; SY6522_AY8910* pMB = &g_MB[nDevice];
@ -720,7 +720,7 @@ static void SSI263_Write(BYTE nDevice, BYTE nReg, BYTE nValue)
//------------------------------------- //-------------------------------------
static BYTE Votrax2SSI263[MAX_VOICES] = static uint8_t Votrax2SSI263[MAX_VOICES] =
{ {
0x02, // 00: EH3 jackEt -> E1 bEnt 0x02, // 00: EH3 jackEt -> E1 bEnt
0x0A, // 01: EH2 Enlist -> EH nEst 0x0A, // 01: EH2 Enlist -> EH nEst
@ -791,7 +791,7 @@ static BYTE Votrax2SSI263[MAX_VOICES] =
0x00, // 3F: STOP no sound -> PA 0x00, // 3F: STOP no sound -> PA
}; };
static void Votrax_Write(BYTE nDevice, BYTE nValue) static void Votrax_Write(uint8_t nDevice, uint8_t nValue)
{ {
g_bVotraxPhoneme = true; g_bVotraxPhoneme = true;
@ -1697,7 +1697,7 @@ void MB_Reset()
#define nAddr ea #define nAddr ea
GLUE_C_READ(MB_Read) GLUE_C_READ(MB_Read)
#else #else
static BYTE MB_Read(uint16_t PC, uint16_t nAddr, BYTE bWrite, BYTE nValue, ULONG nCyclesLeft) static uint8_t MB_Read(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nValue, ULONG nCyclesLeft)
#endif #endif
{ {
MB_UpdateCycles(); MB_UpdateCycles();
@ -1716,8 +1716,8 @@ static BYTE MB_Read(uint16_t PC, uint16_t nAddr, BYTE bWrite, BYTE nValue, ULONG
} }
#endif #endif
BYTE nMB = ((nAddr>>8)&0xf) - SLOT4; uint8_t nMB = ((nAddr>>8)&0xf) - SLOT4;
BYTE nOffset = nAddr&0xff; uint8_t nOffset = nAddr&0xff;
if(g_bPhasorEnable) if(g_bPhasorEnable)
{ {
@ -1732,7 +1732,7 @@ static BYTE MB_Read(uint16_t PC, uint16_t nAddr, BYTE bWrite, BYTE nValue, ULONG
else // Mockingboard Mode else // Mockingboard Mode
CS = ( ( nAddr & 0x80 ) >> 7 ) + 1; // 1 or 2 CS = ( ( nAddr & 0x80 ) >> 7 ) + 1; // 1 or 2
BYTE nRes = 0; uint8_t nRes = 0;
if(CS & 1) if(CS & 1)
nRes |= SY6522_Read(nMB*NUM_DEVS_PER_MB + SY6522_DEVICE_A, nAddr&0xf); nRes |= SY6522_Read(nMB*NUM_DEVS_PER_MB + SY6522_DEVICE_A, nAddr&0xf);
@ -1775,7 +1775,7 @@ static BYTE MB_Read(uint16_t PC, uint16_t nAddr, BYTE bWrite, BYTE nValue, ULONG
#define nValue b #define nValue b
GLUE_C_WRITE(MB_Write) GLUE_C_WRITE(MB_Write)
#else #else
static BYTE MB_Write(uint16_t PC, uint16_t nAddr, BYTE bWrite, BYTE nValue, ULONG nCyclesLeft) static uint8_t MB_Write(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nValue, ULONG nCyclesLeft)
#endif #endif
{ {
MB_UpdateCycles(); MB_UpdateCycles();
@ -1802,8 +1802,8 @@ static BYTE MB_Write(uint16_t PC, uint16_t nAddr, BYTE bWrite, BYTE nValue, ULON
} }
#endif #endif
BYTE nMB = ((nAddr>>8)&0xf) - SLOT4; uint8_t nMB = ((nAddr>>8)&0xf) - SLOT4;
BYTE nOffset = nAddr&0xff; uint8_t nOffset = nAddr&0xff;
if(g_bPhasorEnable) if(g_bPhasorEnable)
{ {
@ -1858,7 +1858,7 @@ static BYTE MB_Write(uint16_t PC, uint16_t nAddr, BYTE bWrite, BYTE nValue, ULON
#ifdef APPLE2IX #ifdef APPLE2IX
GLUE_C_READ(PhasorIO) GLUE_C_READ(PhasorIO)
#else #else
static BYTE PhasorIO(uint16_t PC, uint16_t nAddr, BYTE bWrite, BYTE nValue, ULONG nCyclesLeft) static uint8_t PhasorIO(uint16_t PC, uint16_t nAddr, uint8_t bWrite, uint8_t nValue, ULONG nCyclesLeft)
#endif #endif
{ {
if(!g_bPhasorEnable) if(!g_bPhasorEnable)
@ -1891,9 +1891,9 @@ void mb_io_initialize(unsigned int slot4, unsigned int slot5)
MB_InitializeIO(NULL, slot4, slot5); MB_InitializeIO(NULL, slot4, slot5);
} }
//typedef BYTE (*iofunction)(uint16_t nPC, uint16_t nAddr, BYTE nWriteFlag, BYTE nWriteValue, ULONG nCyclesLeft); //typedef uint8_t (*iofunction)(uint16_t nPC, uint16_t nAddr, uint8_t nWriteFlag, uint8_t nWriteValue, ULONG nCyclesLeft);
typedef void (*iofunction)(); typedef void (*iofunction)();
static void RegisterIoHandler(UINT uSlot, iofunction IOReadC0, iofunction IOWriteC0, iofunction IOReadCx, iofunction IOWriteCx, LPVOID unused_lpSlotParameter, BYTE* unused_pExpansionRom) static void RegisterIoHandler(UINT uSlot, iofunction IOReadC0, iofunction IOWriteC0, iofunction IOReadCx, iofunction IOWriteCx, LPVOID unused_lpSlotParameter, uint8_t* unused_pExpansionRom)
{ {
// card softswitches // card softswitches

40
src/audio/mockingboard.h
View File

@ -24,8 +24,8 @@ typedef struct
{ {
struct struct
{ {
BYTE l; uint8_t l;
BYTE h; uint8_t h;
}; };
uint16_t w; uint16_t w;
}; };
@ -33,10 +33,10 @@ typedef struct
typedef struct typedef struct
{ {
BYTE ORB; // $00 - Port B uint8_t ORB; // $00 - Port B
BYTE ORA; // $01 - Port A (with handshaking) uint8_t ORA; // $01 - Port A (with handshaking)
BYTE DDRB; // $02 - Data Direction Register B uint8_t DDRB; // $02 - Data Direction Register B
BYTE DDRA; // $03 - Data Direction Register A uint8_t DDRA; // $03 - Data Direction Register A
// //
// $04 - Read counter (L) / Write latch (L) // $04 - Read counter (L) / Write latch (L)
// $05 - Read / Write & initiate count (H) // $05 - Read / Write & initiate count (H)
@ -49,23 +49,23 @@ typedef struct
IWORD TIMER2_COUNTER; IWORD TIMER2_COUNTER;
IWORD TIMER2_LATCH; IWORD TIMER2_LATCH;
// //
BYTE SERIAL_SHIFT; // $0A uint8_t SERIAL_SHIFT; // $0A
BYTE ACR; // $0B - Auxiliary Control Register uint8_t ACR; // $0B - Auxiliary Control Register
BYTE PCR; // $0C - Peripheral Control Register uint8_t PCR; // $0C - Peripheral Control Register
BYTE IFR; // $0D - Interrupt Flag Register uint8_t IFR; // $0D - Interrupt Flag Register
BYTE IER; // $0E - Interrupt Enable Register uint8_t IER; // $0E - Interrupt Enable Register
BYTE ORA_NO_HS; // $0F - Port A (without handshaking) uint8_t ORA_NO_HS; // $0F - Port A (without handshaking)
} SY6522; } SY6522;
typedef struct typedef struct
{ {
BYTE DurationPhonome; uint8_t DurationPhonome;
BYTE Inflection; // I10..I3 uint8_t Inflection; // I10..I3
BYTE RateInflection; uint8_t RateInflection;
BYTE CtrlArtAmp; uint8_t CtrlArtAmp;
BYTE FilterFreq; uint8_t FilterFreq;
// //
BYTE CurrentMode; // b7:6=Mode; b0=D7 pin (for IRQ) uint8_t CurrentMode; // b7:6=Mode; b0=D7 pin (for IRQ)
} SSI263A; } SSI263A;
extern SS_CARDTYPE g_Slot4; // Mockingboard, Z80, Mouse in slot4 extern SS_CARDTYPE g_Slot4; // Mockingboard, Z80, Mouse in slot4
@ -76,9 +76,9 @@ extern SS_CARDTYPE g_Slot5; // Mockingboard, Z80 in slot5
typedef struct typedef struct
{ {
SY6522 RegsSY6522; SY6522 RegsSY6522;
BYTE RegsAY8910[16]; uint8_t RegsAY8910[16];
SSI263A RegsSSI263; SSI263A RegsSSI263;
BYTE nAYCurrentRegister; uint8_t nAYCurrentRegister;
bool bTimer1IrqPending; bool bTimer1IrqPending;
bool bTimer2IrqPending; bool bTimer2IrqPending;
bool bSpeechIrqPending; bool bSpeechIrqPending;

1
src/audio/win-shim.h
View File

@ -34,7 +34,6 @@ typedef long LONG;
typedef unsigned int UINT; typedef unsigned int UINT;
typedef char TCHAR; typedef char TCHAR;
typedef short SHORT; typedef short SHORT;
typedef unsigned char BYTE;
typedef long *LPLONG; typedef long *LPLONG;
typedef void *LPVOID; typedef void *LPVOID;