Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 81336
b: refs/heads/master
c: 720c913
h: refs/heads/master
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Paul Mackerras committed Jan 25, 2008
1 parent 3f4de28 commit d0340db
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d0e5c2185e1c6508894e1ee1a8e9bf79e009e427
refs/heads/master: 720c9133ff108998c5fb910d165146de5bc4705a
64 changes: 32 additions & 32 deletions trunk/arch/powerpc/platforms/ps3/repository.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ enum ps3_lpar_id {
};

#define dump_field(_a, _b) _dump_field(_a, _b, __func__, __LINE__)
static void _dump_field(const char *hdr, u64 n, const char* func, int line)
static void _dump_field(const char *hdr, u64 n, const char *func, int line)
{
#if defined(DEBUG)
char s[16];
Expand All @@ -50,8 +50,8 @@ static void _dump_field(const char *hdr, u64 n, const char* func, int line)

#define dump_node_name(_a, _b, _c, _d, _e) \
_dump_node_name(_a, _b, _c, _d, _e, __func__, __LINE__)
static void _dump_node_name (unsigned int lpar_id, u64 n1, u64 n2, u64 n3,
u64 n4, const char* func, int line)
static void _dump_node_name(unsigned int lpar_id, u64 n1, u64 n2, u64 n3,
u64 n4, const char *func, int line)
{
pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
_dump_field("n1: ", n1, func, line);
Expand All @@ -63,7 +63,7 @@ static void _dump_node_name (unsigned int lpar_id, u64 n1, u64 n2, u64 n3,
#define dump_node(_a, _b, _c, _d, _e, _f, _g) \
_dump_node(_a, _b, _c, _d, _e, _f, _g, __func__, __LINE__)
static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
u64 v1, u64 v2, const char* func, int line)
u64 v1, u64 v2, const char *func, int line)
{
pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
_dump_field("n1: ", n1, func, line);
Expand Down Expand Up @@ -165,7 +165,7 @@ int ps3_repository_read_bus_str(unsigned int bus_index, const char *bus_str,
make_first_field("bus", bus_index),
make_field(bus_str, 0),
0, 0,
value, 0);
value, NULL);
}

int ps3_repository_read_bus_id(unsigned int bus_index, u64 *bus_id)
Expand All @@ -190,7 +190,7 @@ int ps3_repository_read_bus_type(unsigned int bus_index,
make_first_field("bus", bus_index),
make_field("type", 0),
0, 0,
&v1, 0);
&v1, NULL);
*bus_type = v1;
return result;
}
Expand All @@ -205,7 +205,7 @@ int ps3_repository_read_bus_num_dev(unsigned int bus_index,
make_first_field("bus", bus_index),
make_field("num_dev", 0),
0, 0,
&v1, 0);
&v1, NULL);
*num_dev = v1;
return result;
}
Expand All @@ -218,7 +218,7 @@ int ps3_repository_read_dev_str(unsigned int bus_index,
make_field("dev", dev_index),
make_field(dev_str, 0),
0,
value, 0);
value, NULL);
}

int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index,
Expand All @@ -231,7 +231,7 @@ int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index,
make_field("dev", dev_index),
make_field("id", 0),
0,
dev_id, 0);
dev_id, NULL);
return result;
}

Expand All @@ -246,14 +246,14 @@ int ps3_repository_read_dev_type(unsigned int bus_index,
make_field("dev", dev_index),
make_field("type", 0),
0,
&v1, 0);
&v1, NULL);
*dev_type = v1;
return result;
}

int ps3_repository_read_dev_intr(unsigned int bus_index,
unsigned int dev_index, unsigned int intr_index,
enum ps3_interrupt_type *intr_type, unsigned int* interrupt_id)
enum ps3_interrupt_type *intr_type, unsigned int *interrupt_id)
{
int result;
u64 v1;
Expand Down Expand Up @@ -282,7 +282,7 @@ int ps3_repository_read_dev_reg_type(unsigned int bus_index,
make_field("dev", dev_index),
make_field("reg", reg_index),
make_field("type", 0),
&v1, 0);
&v1, NULL);
*reg_type = v1;
return result;
}
Expand Down Expand Up @@ -588,7 +588,7 @@ int ps3_repository_read_stor_dev_port(unsigned int bus_index,
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("port", 0),
0, port, 0);
0, port, NULL);
}

int ps3_repository_read_stor_dev_blk_size(unsigned int bus_index,
Expand All @@ -598,7 +598,7 @@ int ps3_repository_read_stor_dev_blk_size(unsigned int bus_index,
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("blk_size", 0),
0, blk_size, 0);
0, blk_size, NULL);
}

int ps3_repository_read_stor_dev_num_blocks(unsigned int bus_index,
Expand All @@ -608,7 +608,7 @@ int ps3_repository_read_stor_dev_num_blocks(unsigned int bus_index,
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("n_blocks", 0),
0, num_blocks, 0);
0, num_blocks, NULL);
}

int ps3_repository_read_stor_dev_num_regions(unsigned int bus_index,
Expand All @@ -621,7 +621,7 @@ int ps3_repository_read_stor_dev_num_regions(unsigned int bus_index,
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("n_regs", 0),
0, &v1, 0);
0, &v1, NULL);
*num_regions = v1;
return result;
}
Expand All @@ -638,7 +638,7 @@ int ps3_repository_read_stor_dev_region_id(unsigned int bus_index,
make_field("dev", dev_index),
make_field("region", region_index),
make_field("id", 0),
&v1, 0);
&v1, NULL);
*region_id = v1;
return result;
}
Expand All @@ -651,7 +651,7 @@ int ps3_repository_read_stor_dev_region_size(unsigned int bus_index,
make_field("dev", dev_index),
make_field("region", region_index),
make_field("size", 0),
region_size, 0);
region_size, NULL);
}

int ps3_repository_read_stor_dev_region_start(unsigned int bus_index,
Expand All @@ -662,7 +662,7 @@ int ps3_repository_read_stor_dev_region_start(unsigned int bus_index,
make_field("dev", dev_index),
make_field("region", region_index),
make_field("start", 0),
region_start, 0);
region_start, NULL);
}

int ps3_repository_read_stor_dev_info(unsigned int bus_index,
Expand Down Expand Up @@ -718,7 +718,7 @@ int ps3_repository_read_rm_size(unsigned int ppe_id, u64 *rm_size)
make_field("pu", 0),
ppe_id,
make_field("rm_size", 0),
rm_size, 0);
rm_size, NULL);
}

int ps3_repository_read_region_total(u64 *region_total)
Expand All @@ -727,7 +727,7 @@ int ps3_repository_read_region_total(u64 *region_total)
make_first_field("bi", 0),
make_field("rgntotal", 0),
0, 0,
region_total, 0);
region_total, NULL);
}

/**
Expand Down Expand Up @@ -763,7 +763,7 @@ int ps3_repository_read_num_spu_reserved(unsigned int *num_spu_reserved)
make_first_field("bi", 0),
make_field("spun", 0),
0, 0,
&v1, 0);
&v1, NULL);
*num_spu_reserved = v1;
return result;
}
Expand All @@ -782,7 +782,7 @@ int ps3_repository_read_num_spu_resource_id(unsigned int *num_resource_id)
make_first_field("bi", 0),
make_field("spursvn", 0),
0, 0,
&v1, 0);
&v1, NULL);
*num_resource_id = v1;
return result;
}
Expand All @@ -795,7 +795,7 @@ int ps3_repository_read_num_spu_resource_id(unsigned int *num_resource_id)
*/

int ps3_repository_read_spu_resource_id(unsigned int res_index,
enum ps3_spu_resource_type* resource_type, unsigned int *resource_id)
enum ps3_spu_resource_type *resource_type, unsigned int *resource_id)
{
int result;
u64 v1;
Expand All @@ -812,14 +812,14 @@ int ps3_repository_read_spu_resource_id(unsigned int res_index,
return result;
}

int ps3_repository_read_boot_dat_address(u64 *address)
static int ps3_repository_read_boot_dat_address(u64 *address)
{
return read_node(PS3_LPAR_ID_CURRENT,
make_first_field("bi", 0),
make_field("boot_dat", 0),
make_field("address", 0),
0,
address, 0);
address, NULL);
}

int ps3_repository_read_boot_dat_size(unsigned int *size)
Expand All @@ -832,7 +832,7 @@ int ps3_repository_read_boot_dat_size(unsigned int *size)
make_field("boot_dat", 0),
make_field("size", 0),
0,
&v1, 0);
&v1, NULL);
*size = v1;
return result;
}
Expand All @@ -847,7 +847,7 @@ int ps3_repository_read_vuart_av_port(unsigned int *port)
make_field("vir_uart", 0),
make_field("port", 0),
make_field("avset", 0),
&v1, 0);
&v1, NULL);
*port = v1;
return result;
}
Expand All @@ -862,7 +862,7 @@ int ps3_repository_read_vuart_sysmgr_port(unsigned int *port)
make_field("vir_uart", 0),
make_field("port", 0),
make_field("sysmgr", 0),
&v1, 0);
&v1, NULL);
*port = v1;
return result;
}
Expand Down Expand Up @@ -893,7 +893,7 @@ int ps3_repository_read_num_be(unsigned int *num_be)
0,
0,
0,
&v1, 0);
&v1, NULL);
*num_be = v1;
return result;
}
Expand All @@ -905,7 +905,7 @@ int ps3_repository_read_be_node_id(unsigned int be_index, u64 *node_id)
0,
0,
0,
node_id, 0);
node_id, NULL);
}

int ps3_repository_read_tb_freq(u64 node_id, u64 *tb_freq)
Expand All @@ -915,7 +915,7 @@ int ps3_repository_read_tb_freq(u64 node_id, u64 *tb_freq)
node_id,
make_field("clock", 0),
0,
tb_freq, 0);
tb_freq, NULL);
}

int ps3_repository_read_be_tb_freq(unsigned int be_index, u64 *tb_freq)
Expand Down

0 comments on commit d0340db

Please sign in to comment.