X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcdrom.h;h=c7d32b271670c0212bc35d6cd42898fef54ba491;hb=5d76d651dfc3aa0a2e810e6b6db2ae8a2e34c53e;hp=dbedb773e14159653ad98b93637e5856628445ac;hpb=683f283e1328164c176618088c34408ea6c03cf7;p=virtualjaguar

diff --git a/src/cdrom.h b/src/cdrom.h
index dbedb77..c7d32b2 100644
--- a/src/cdrom.h
+++ b/src/cdrom.h
@@ -5,21 +5,22 @@
 #ifndef __CDROM_H__
 #define __CDROM_H__
 
-#include "types.h"
+//#include "types.h"
+#include "memory.h"
 
 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__