Sat Apr 11 01:49:00 2015 UTC ()
Nuke UIO_XUIO so nothing accidentally misuses it.


(riastradh)
diff -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/uio.h
cvs diff -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/uio.h (expand / switch to unified diff)

--- src/external/cddl/osnet/sys/sys/uio.h 2015/03/19 22:57:45 1.6
+++ src/external/cddl/osnet/sys/sys/uio.h 2015/04/11 01:49:00 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: uio.h,v 1.6 2015/03/19 22:57:45 riastradh Exp $ */ 1/* $NetBSD: uio.h,v 1.7 2015/04/11 01:49:00 riastradh Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 The NetBSD Foundation, Inc. 4 * Copyright (c) 2009 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Andrew Doran. 8 * by Andrew Doran.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -77,30 +77,26 @@ struct uio { @@ -77,30 +77,26 @@ struct uio {
77 int uio_resid; 77 int uio_resid;
78 enum uio_seg uio_segflg; 78 enum uio_seg uio_segflg;
79 enum uio_rw uio_rw; 79 enum uio_rw uio_rw;
80 void *uio_td; 80 void *uio_td;
81}; 81};
82#endif 82#endif
83 83
84struct xuio { 84struct xuio {
85 struct uio xu_uio; 85 struct uio xu_uio;
86 int xuio_rw; 86 int xuio_rw;
87 void *xuio_priv; 87 void *xuio_priv;
88}; 88};
89 89
90/* XXX HACK ? how xuio can be handled properly */ 
91#define uio_extflg uio_offset 
92#define UIO_XUIO 0x0004 /* Structure is xuio_t */ 
93 
94#define XUIO_XUZC_PRIV(xuio) ((xuio)->xuio_priv) 90#define XUIO_XUZC_PRIV(xuio) ((xuio)->xuio_priv)
95#define XUIO_XUZC_RW(xuio) ((xuio)->xuio_rw) 91#define XUIO_XUZC_RW(xuio) ((xuio)->xuio_rw)
96 92
97typedef struct uio uio_t; 93typedef struct uio uio_t;
98typedef struct xuio xuio_t; 94typedef struct xuio xuio_t;
99typedef struct iovec iovec_t; 95typedef struct iovec iovec_t;
100 96
101typedef enum uio_seg uio_seg_t; 97typedef enum uio_seg uio_seg_t;
102 98
103#define uio_loffset uio_offset 99#define uio_loffset uio_offset
104 100
105int uiomove(void *, size_t, struct uio *); 101int uiomove(void *, size_t, struct uio *);
106 102