patch-hw_xfree86_common_compiler_h 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758
  1. --- xorg-server-1.12.2.orig/hw/xfree86/common/compiler.h 2012-05-17 19:09:03.000000000 +0200
  2. +++ xorg-server-1.12.2/hw/xfree86/common/compiler.h 2013-04-30 10:52:21.000000000 +0200
  3. @@ -710,26 +710,26 @@ xf86WriteMmio32LeNB(__volatile__ void *b
  4. #define PORT_SIZE short
  5. #endif
  6. -_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
  7. +_X_EXPORT volatile unsigned char *ioBase; /* Memory mapped I/O port area */
  8. static __inline__ void
  9. outb(unsigned PORT_SIZE port, unsigned char val)
  10. {
  11. - *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
  12. + *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + ioBase) =
  13. val;
  14. }
  15. static __inline__ void
  16. outw(unsigned PORT_SIZE port, unsigned short val)
  17. {
  18. - *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
  19. + *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + ioBase) =
  20. val;
  21. }
  22. static __inline__ void
  23. outl(unsigned PORT_SIZE port, unsigned int val)
  24. {
  25. - *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
  26. + *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + ioBase) =
  27. val;
  28. }
  29. @@ -737,21 +737,21 @@ static __inline__ unsigned int
  30. inb(unsigned PORT_SIZE port)
  31. {
  32. return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) +
  33. - IOPortBase);
  34. + ioBase);
  35. }
  36. static __inline__ unsigned int
  37. inw(unsigned PORT_SIZE port)
  38. {
  39. return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) +
  40. - IOPortBase);
  41. + ioBase);
  42. }
  43. static __inline__ unsigned int
  44. inl(unsigned PORT_SIZE port)
  45. {
  46. return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) +
  47. - IOPortBase);
  48. + ioBase);
  49. }
  50. #if defined(__mips__)