summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2011-11-01 22:57:33 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2011-11-01 22:57:33 -0700
commit2901c9cf5e842cef199676e76cd0ffa532a76a9b (patch)
tree95dc3315449e8188d4c3119b164ca6e0d0036dc0
parent6272e69d8519c43293192b48ff39c8b3a84635d3 (diff)
Use unsigned long rather than deprecated IOADDRESS
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--src/sisusb.h2
-rw-r--r--src/sisusb_osdef.h12
-rw-r--r--src/sisusb_types.h2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/sisusb.h b/src/sisusb.h
index 1036d42..82ed509 100644
--- a/src/sisusb.h
+++ b/src/sisusb.h
@@ -739,7 +739,7 @@ typedef struct {
Bool skipswitchcheck;
ULong VBFlagsInit;
DisplayModePtr currentModeLast;
- IOADDRESS MyPIOOffset;
+ unsigned long MyPIOOffset;
char messagebuffer[64];
unsigned int VGAMapSize; /* SiSVGA stuff */
diff --git a/src/sisusb_osdef.h b/src/sisusb_osdef.h
index 2d938ad..500bffb 100644
--- a/src/sisusb_osdef.h
+++ b/src/sisusb_osdef.h
@@ -77,11 +77,11 @@
#define SIS315H
-#define OutPortByte(p,v) outSISREG((IOADDRESS)(p),(CARD8)(v))
-#define OutPortWord(p,v) outSISREGW((IOADDRESS)(p),(CARD16)(v))
-#define OutPortLong(p,v) outSISREGL((IOADDRESS)(p),(CARD32)(v))
-#define InPortByte(p) inSISREG((IOADDRESS)(p))
-#define InPortWord(p) inSISREGW((IOADDRESS)(p))
-#define InPortLong(p) inSISREGL((IOADDRESS)(p))
+#define OutPortByte(p,v) outSISREG((unsigned long)(p),(CARD8)(v))
+#define OutPortWord(p,v) outSISREGW((unsigned long)(p),(CARD16)(v))
+#define OutPortLong(p,v) outSISREGL((unsigned long)(p),(CARD32)(v))
+#define InPortByte(p) inSISREG((unsigned long)(p))
+#define InPortWord(p) inSISREGW((unsigned long)(p))
+#define InPortLong(p) inSISREGL((unsigned long)(p))
#endif /* _SISUSB_OSDEF_H_ */
diff --git a/src/sisusb_types.h b/src/sisusb_types.h
index df3618f..9fc6b41 100644
--- a/src/sisusb_types.h
+++ b/src/sisusb_types.h
@@ -95,7 +95,7 @@ typedef unsigned char BOOLEAN;
#define SISIOMEMTYPE
-typedef IOADDRESS SISIOADDRESS;
+typedef unsigned long SISIOADDRESS;
typedef enum _SIS_CHIP_TYPE {
SIS_VGALegacy = 0,