Wed Jul 24 02:50:51 2013 UTC ()
Use bus_addr_t, not bus_size_t, for resource_size_t; add phys_addr_t.


(riastradh)
diff -r1.1.2.6 -r1.1.2.7 src/sys/external/bsd/drm2/include/linux/types.h
cvs diff -r1.1.2.6 -r1.1.2.7 src/sys/external/bsd/drm2/include/linux/Attic/types.h (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/include/linux/Attic/types.h 2013/07/24 02:12:29 1.1.2.6
+++ src/sys/external/bsd/drm2/include/linux/Attic/types.h 2013/07/24 02:50:51 1.1.2.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: types.h,v 1.1.2.6 2013/07/24 02:12:29 riastradh Exp $ */ 1/* $NetBSD: types.h,v 1.1.2.7 2013/07/24 02:50:51 riastradh Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2013 The NetBSD Foundation, Inc. 4 * Copyright (c) 2013 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 Taylor R. Campbell. 8 * by Taylor R. Campbell.
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.
@@ -39,19 +39,25 @@ typedef uint8_t u8; @@ -39,19 +39,25 @@ typedef uint8_t u8;
39typedef uint16_t u16; 39typedef uint16_t u16;
40typedef uint32_t u32; 40typedef uint32_t u32;
41typedef uint64_t u64; 41typedef uint64_t u64;
42 42
43typedef int8_t s8; 43typedef int8_t s8;
44typedef int16_t s16; 44typedef int16_t s16;
45typedef int32_t s32; 45typedef int32_t s32;
46typedef int64_t s64; 46typedef int64_t s64;
47 47
48typedef uint16_t __le16; 48typedef uint16_t __le16;
49typedef uint32_t __le32; 49typedef uint32_t __le32;
50typedef uint64_t __le64; 50typedef uint64_t __le64;
51 51
52typedef bus_size_t resource_size_t; 52/*
 53 * This is used for absolute bus addresses, so it has to be bus_addr_t
 54 * and not bus_size_t; bus_addr_t is sometimes wider than bus_size_t.
 55 */
 56typedef bus_addr_t resource_size_t;
 57
 58typedef paddr_t phys_addr_t;
53 59
54/* XXX Is this the right type? */ 60/* XXX Is this the right type? */
55typedef unsigned long long cycles_t; 61typedef unsigned long long cycles_t;
56 62
57#endif /* _LINUX_TYPES_H_ */ 63#endif /* _LINUX_TYPES_H_ */