Module Name: src
Committed By: christos
Date: Sun Jan 24 16:47:50 UTC 2016
Modified Files:
src/sys/arch/alpha/include: bus_user.h types.h
Log Message:
use __paddr_t since this is a userland API.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/alpha/include/bus_user.h
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/alpha/include/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/include/bus_user.h
diff -u src/sys/arch/alpha/include/bus_user.h:1.1 src/sys/arch/alpha/include/bus_user.h:1.2
--- src/sys/arch/alpha/include/bus_user.h:1.1 Fri Aug 12 18:23:12 2011
+++ src/sys/arch/alpha/include/bus_user.h Sun Jan 24 11:47:50 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_user.h,v 1.1 2011/08/12 22:23:12 dyoung Exp $ */
+/* $NetBSD: bus_user.h,v 1.2 2016/01/24 16:47:50 christos Exp $ */
/*
* XXX This file is a stopgap intended to keep NetBSD/alpha buildable
* XXX while developers figure out whether/how to expose to userland
@@ -24,8 +24,8 @@ typedef u_long bus_size_t;
struct alpha_bus_space_translation {
bus_addr_t abst_bus_start; /* start of bus window */
bus_addr_t abst_bus_end; /* end of bus window */
- paddr_t abst_sys_start; /* start of sysBus window */
- paddr_t abst_sys_end; /* end of sysBus window */
+ __paddr_t abst_sys_start; /* start of sysBus window */
+ __paddr_t abst_sys_end; /* end of sysBus window */
int abst_addr_shift;/* address shift */
int abst_size_shift;/* size shift */
int abst_flags; /* flags; see below */
Index: src/sys/arch/alpha/include/types.h
diff -u src/sys/arch/alpha/include/types.h:1.53 src/sys/arch/alpha/include/types.h:1.54
--- src/sys/arch/alpha/include/types.h:1.53 Sat Jan 23 17:31:19 2016
+++ src/sys/arch/alpha/include/types.h Sun Jan 24 11:47:50 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.53 2016/01/23 22:31:19 christos Exp $ */
+/* $NetBSD: types.h,v 1.54 2016/01/24 16:47:50 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -44,8 +44,13 @@ typedef struct label_t {
} label_t;
#endif
+typedef int __cpu_simple_lock_nv_t;
+typedef long int __register_t;
+typedef unsigned long __paddr_t; /* XXX: For bus_user.h */
+
+
#if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES) || defined(_STANDALONE)
-typedef unsigned long paddr_t;
+typedef __paddr_t paddr_t;
typedef unsigned long psize_t;
typedef unsigned long vaddr_t;
typedef unsigned long vsize_t;
@@ -56,13 +61,10 @@ typedef unsigned long vsize_t;
#define PRIxVSIZE "lx"
#define PRIuVSIZE "lu"
-typedef long int register_t;
+typedef __register_t register_t;
#define PRIxREGISTER "lx"
#endif
-typedef int __cpu_simple_lock_nv_t;
-typedef long int __register_t;
-
#define __SIMPLELOCK_LOCKED 1
#define __SIMPLELOCK_UNLOCKED 0
