Sat Dec 7 13:31:41 2019 UTC ()
Fix build for ports without __BUS_SPACE_HAS_STREAM_METHODS defined


(jmcneill)
diff -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h

cvs diff -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h 2018/08/27 07:35:13 1.4
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h 2019/12/07 13:31:41 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: os.h,v 1.4 2018/08/27 07:35:13 riastradh Exp $ */ 1/* $NetBSD: os.h,v 1.5 2019/12/07 13:31:41 jmcneill Exp $ */
2 2
3#ifndef __NOUVEAU_OS_H__ 3#ifndef __NOUVEAU_OS_H__
4#define __NOUVEAU_OS_H__ 4#define __NOUVEAU_OS_H__
5 5
6#include <linux/types.h> 6#include <linux/types.h>
7#include <linux/slab.h> 7#include <linux/slab.h>
8#include <linux/mutex.h> 8#include <linux/mutex.h>
9#include <linux/pci.h> 9#include <linux/pci.h>
10#include <linux/platform_device.h> 10#include <linux/platform_device.h>
11#include <linux/printk.h> 11#include <linux/printk.h>
12#include <linux/bitops.h> 12#include <linux/bitops.h>
13#include <linux/firmware.h> 13#include <linux/firmware.h>
14#include <linux/module.h> 14#include <linux/module.h>
@@ -64,14 +64,24 @@ @@ -64,14 +64,24 @@
64#define ioread16_native ioread16be 64#define ioread16_native ioread16be
65#define iowrite16_native iowrite16be 65#define iowrite16_native iowrite16be
66#define ioread32_native ioread32be 66#define ioread32_native ioread32be
67#define iowrite32_native iowrite32be 67#define iowrite32_native iowrite32be
68#else /* def __BIG_ENDIAN */ 68#else /* def __BIG_ENDIAN */
69#define ioread16_native ioread16 69#define ioread16_native ioread16
70#define iowrite16_native iowrite16 70#define iowrite16_native iowrite16
71#define ioread32_native ioread32 71#define ioread32_native ioread32
72#define iowrite32_native iowrite32 72#define iowrite32_native iowrite32
73#endif /* def __BIG_ENDIAN else */ 73#endif /* def __BIG_ENDIAN else */
74#endif /* !ioread32_native */ 74#endif /* !ioread32_native */
75#endif 75#endif
76 76
 77#ifdef __NetBSD__
 78#include <sys/bus.h>
 79#ifndef __BUS_SPACE_HAS_STREAM_METHODS
 80#define bus_space_read_stream_2 bus_space_read_2
 81#define bus_space_read_stream_4 bus_space_read_4
 82#define bus_space_write_stream_2 bus_space_write_2
 83#define bus_space_write_stream_4 bus_space_write_4
 84#endif
 85#endif
 86
77#endif 87#endif