Removed some cruft and nonstandard int/uint types, added M series BIOS.

[virtualjaguar] / src / cdrom.h

diff --git a/src/cdrom.h b/src/cdrom.h
index 963a02aeb54a620ebd5770f4a9574e1ffe80b4e9..c7d32b271670c0212bc35d6cd42898fef54ba491 100644 (file)
--- a/src/cdrom.h
+++ b/src/cdrom.h
@@ -12,15 +12,15 @@ void CDROMInit(void);
 void CDROMReset(void);
 void CDROMDone(void);
 
-void BUTCHExec(uint32 cycles);
+void BUTCHExec(uint32_t cycles);
 
-uint8 CDROMReadByte(uint32 offset, uint32 who = UNKNOWN);
-uint16 CDROMReadWord(uint32 offset, uint32 who = UNKNOWN);
-void CDROMWriteByte(uint32 offset, uint8 data, uint32 who = UNKNOWN);
-void CDROMWriteWord(uint32 offset, uint16 data, uint32 who = UNKNOWN);
+uint8_t CDROMReadByte(uint32_t offset, uint32_t who = UNKNOWN);
+uint16_t CDROMReadWord(uint32_t offset, uint32_t who = UNKNOWN);
+void CDROMWriteByte(uint32_t offset, uint8_t data, uint32_t who = UNKNOWN);
+void CDROMWriteWord(uint32_t offset, uint16_t data, uint32_t who = UNKNOWN);
 
 bool ButchIsReadyToSend(void);
-uint16 GetWordFromButchSSI(uint32 offset, uint32 who = UNKNOWN);
+uint16_t GetWordFromButchSSI(uint32_t offset, uint32_t who = UNKNOWN);
 void SetSSIWordsXmittedFromButch(void);
 
 #endif // __CDROM_H__