amalgamation

[picodrive.git] / Pico / VideoPort.c

diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c
index d70bbb5..a4fe3c8 100644 (file)
--- a/Pico/VideoPort.c
+++ b/Pico/VideoPort.c
@@ -15,8 +15,12 @@ extern const unsigned char  hcounts_40[];
 extern const unsigned short vcounts[];\r
 extern int rendstatus;\r
 \r
+#ifndef UTYPES_DEFINED\r
 typedef unsigned char  u8;\r
 typedef unsigned short u16;\r
+typedef unsigned int   u32;\r
+#define UTYPES_DEFINED\r
+#endif\r
 \r
 \r
 static __inline void AutoIncrement()\r
@@ -308,7 +312,7 @@ static void CommandChange()
   if (cmd&0x80) CommandDma();\r
 }\r
 \r
-void PicoVideoWrite(unsigned int a,unsigned short d)\r
+PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)\r
 {\r
   struct PicoVideo *pvid=&Pico.video;\r
 \r
@@ -390,7 +394,7 @@ void PicoVideoWrite(unsigned int a,unsigned short d)
   }\r
 }\r
 \r
-unsigned int PicoVideoRead(unsigned int a)\r
+PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)\r
 {\r
   unsigned int d=0;\r
 \r