aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/ps3/platform.h
diff options
context:
space:
mode:
authorGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>2008-01-18 15:30:09 -0500
committerPaul Mackerras <paulus@samba.org>2008-01-25 06:52:51 -0500
commit034e0ab54bfe57bc980452f991d3ab443f1b085a (patch)
treea58c442aafab2bd29eb00d58b23fc919b77e7e28 /arch/powerpc/platforms/ps3/platform.h
parentcda563fb9ca2c26ff720110b25e96205b71d3bae (diff)
[POWERPC] PS3: Make bus_id and dev_id u64
Change the PS3 bus_id and dev_id from type unsigned int to u64. These IDs are 64-bit in the repository, and the special storage notification device has a device ID of ULONG_MAX. Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/ps3/platform.h')
-rw-r--r--arch/powerpc/platforms/ps3/platform.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
index 01f0c9506e1..aa9dddf5017 100644
--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -95,7 +95,7 @@ enum ps3_dev_type {
95 95
96int ps3_repository_read_bus_str(unsigned int bus_index, const char *bus_str, 96int ps3_repository_read_bus_str(unsigned int bus_index, const char *bus_str,
97 u64 *value); 97 u64 *value);
98int ps3_repository_read_bus_id(unsigned int bus_index, unsigned int *bus_id); 98int ps3_repository_read_bus_id(unsigned int bus_index, u64 *bus_id);
99int ps3_repository_read_bus_type(unsigned int bus_index, 99int ps3_repository_read_bus_type(unsigned int bus_index,
100 enum ps3_bus_type *bus_type); 100 enum ps3_bus_type *bus_type);
101int ps3_repository_read_bus_num_dev(unsigned int bus_index, 101int ps3_repository_read_bus_num_dev(unsigned int bus_index,
@@ -119,7 +119,7 @@ enum ps3_reg_type {
119int ps3_repository_read_dev_str(unsigned int bus_index, 119int ps3_repository_read_dev_str(unsigned int bus_index,
120 unsigned int dev_index, const char *dev_str, u64 *value); 120 unsigned int dev_index, const char *dev_str, u64 *value);
121int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index, 121int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index,
122 unsigned int *dev_id); 122 u64 *dev_id);
123int ps3_repository_read_dev_type(unsigned int bus_index, 123int ps3_repository_read_dev_type(unsigned int bus_index,
124 unsigned int dev_index, enum ps3_dev_type *dev_type); 124 unsigned int dev_index, enum ps3_dev_type *dev_type);
125int ps3_repository_read_dev_intr(unsigned int bus_index, 125int ps3_repository_read_dev_intr(unsigned int bus_index,
@@ -138,12 +138,12 @@ int ps3_repository_read_dev_reg(unsigned int bus_index,
138/* repository bus enumerators */ 138/* repository bus enumerators */
139 139
140struct ps3_repository_device { 140struct ps3_repository_device {
141 enum ps3_bus_type bus_type;
142 unsigned int bus_index; 141 unsigned int bus_index;
143 unsigned int bus_id;
144 enum ps3_dev_type dev_type;
145 unsigned int dev_index; 142 unsigned int dev_index;
146 unsigned int dev_id; 143 enum ps3_bus_type bus_type;
144 enum ps3_dev_type dev_type;
145 u64 bus_id;
146 u64 dev_id;
147}; 147};
148 148
149static inline struct ps3_repository_device *ps3_repository_bump_device( 149static inline struct ps3_repository_device *ps3_repository_bump_device(