diff options
| author | Zhang Wei <wei.zhang@freescale.com> | 2008-04-18 13:33:42 -0700 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-29 19:40:28 +1000 |
| commit | e042323607f5c14844b1c59aebbca8d1251c7d89 (patch) | |
| tree | 10c9eac3d5146f3611af9220740e4ec27bf2ade0 /drivers/rapidio/rio.h | |
| parent | cc2bb6968a2c842149d285d77cb35200d2d37b15 (diff) | |
| download | op-kernel-dev-e042323607f5c14844b1c59aebbca8d1251c7d89.zip op-kernel-dev-e042323607f5c14844b1c59aebbca8d1251c7d89.tar.gz | |
[RAPIDIO] Auto-probe the RapidIO system size
The RapidIO system size will auto probe in RIO setup. The route table
and rionet_active in rionet.c are changed to be allocated dynamically
according to the size of the system.
Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/rapidio/rio.h')
| -rw-r--r-- | drivers/rapidio/rio.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/rapidio/rio.h b/drivers/rapidio/rio.h index 80e3f03..7786d02 100644 --- a/drivers/rapidio/rio.h +++ b/drivers/rapidio/rio.h @@ -51,10 +51,5 @@ extern struct rio_route_ops __end_rio_route_ops[]; DECLARE_RIO_ROUTE_SECTION(.rio_route_ops, \ vid, did, add_hook, get_hook) -#ifdef CONFIG_RAPIDIO_8_BIT_TRANSPORT -#define RIO_GET_DID(x) ((x & 0x00ff0000) >> 16) -#define RIO_SET_DID(x) ((x & 0x000000ff) << 16) -#else -#define RIO_GET_DID(x) (x & 0xffff) -#define RIO_SET_DID(x) (x & 0xffff) -#endif +#define RIO_GET_DID(size, x) (size ? (x & 0xffff) : ((x & 0x00ff0000) >> 16)) +#define RIO_SET_DID(size, x) (size ? (x & 0xffff) : ((x & 0x000000ff) << 16)) |
