git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
ppc
/
8xx_io
/
uart.c
diff --git
a/arch/ppc/8xx_io/uart.c
b/arch/ppc/8xx_io/uart.c
index
7acc703
..
171e5e9
100644
(file)
--- a/
arch/ppc/8xx_io/uart.c
+++ b/
arch/ppc/8xx_io/uart.c
@@
-2491,7
+2491,7
@@
static int __init rs_8xx_init(void)
{
struct serial_state * state;
ser_info_t *info;
{
struct serial_state * state;
ser_info_t *info;
- uint mem_addr,
dp_addr, iobits
;
+ uint mem_addr,
iobits, dp_offset
;
int i, j, idx;
ushort chan;
volatile cbd_t *bdp;
int i, j, idx;
ushort chan;
volatile cbd_t *bdp;
@@
-2623,7
+2623,7
@@
static int __init rs_8xx_init(void)
* descriptors from dual port ram, and a character
* buffer area from host mem.
*/
* descriptors from dual port ram, and a character
* buffer area from host mem.
*/
- dp_
addr = m8xx_cpm_dpalloc(sizeof(cbd_t) * RX_NUM_FIFO
);
+ dp_
offset = cpm_dpalloc(sizeof(cbd_t) * RX_NUM_FIFO, 8
);
/* Allocate space for FIFOs in the host memory.
*/
/* Allocate space for FIFOs in the host memory.
*/
@@
-2634,7
+2634,7
@@
static int __init rs_8xx_init(void)
* buffers in the buffer descriptors, and the
* virtual address for us to work with.
*/
* buffers in the buffer descriptors, and the
* virtual address for us to work with.
*/
- bdp = (cbd_t *)&cp->cp_dpmem[dp_
addr
];
+ bdp = (cbd_t *)&cp->cp_dpmem[dp_
offset
];
info->rx_cur = info->rx_bd_base = (cbd_t *)bdp;
for (j=0; j<(RX_NUM_FIFO-1); j++) {
info->rx_cur = info->rx_bd_base = (cbd_t *)bdp;
for (j=0; j<(RX_NUM_FIFO-1); j++) {
@@
-2650,15
+2650,15
@@
static int __init rs_8xx_init(void)
if (info->state->smc_scc_num & NUM_IS_SCC) {
scp = &cp->cp_scc[idx];
sup = (scc_uart_t *)&cp->cp_dparam[state->port];
if (info->state->smc_scc_num & NUM_IS_SCC) {
scp = &cp->cp_scc[idx];
sup = (scc_uart_t *)&cp->cp_dparam[state->port];
- sup->scc_genscc.scc_rbase = dp_
addr
;
+ sup->scc_genscc.scc_rbase = dp_
offset
;
}
else {
sp = &cp->cp_smc[idx];
up = (smc_uart_t *)&cp->cp_dparam[state->port];
}
else {
sp = &cp->cp_smc[idx];
up = (smc_uart_t *)&cp->cp_dparam[state->port];
- up->smc_rbase = dp_
addr
;
+ up->smc_rbase = dp_
offset
;
}
}
- dp_
addr = m8xx_cpm_dpalloc(sizeof(cbd_t) * TX_NUM_FIFO
);
+ dp_
offset = cpm_dpalloc(sizeof(cbd_t) * TX_NUM_FIFO, 8
);
/* Allocate space for FIFOs in the host memory.
*/
/* Allocate space for FIFOs in the host memory.
*/
@@
-2669,7
+2669,7
@@
static int __init rs_8xx_init(void)
* buffers in the buffer descriptors, and the
* virtual address for us to work with.
*/
* buffers in the buffer descriptors, and the
* virtual address for us to work with.
*/
- bdp = (cbd_t *)&cp->cp_dpmem[dp_
addr
];
+ bdp = (cbd_t *)&cp->cp_dpmem[dp_
offset
];
info->tx_cur = info->tx_bd_base = (cbd_t *)bdp;
for (j=0; j<(TX_NUM_FIFO-1); j++) {
info->tx_cur = info->tx_bd_base = (cbd_t *)bdp;
for (j=0; j<(TX_NUM_FIFO-1); j++) {
@@
-2682,7
+2682,7
@@
static int __init rs_8xx_init(void)
bdp->cbd_sc = (BD_SC_WRAP | BD_SC_INTRPT);
if (info->state->smc_scc_num & NUM_IS_SCC) {
bdp->cbd_sc = (BD_SC_WRAP | BD_SC_INTRPT);
if (info->state->smc_scc_num & NUM_IS_SCC) {
- sup->scc_genscc.scc_tbase = dp_
addr
;
+ sup->scc_genscc.scc_tbase = dp_
offset
;
/* Set up the uart parameters in the
* parameter ram.
/* Set up the uart parameters in the
* parameter ram.
@@
-2779,7
+2779,7
@@
static int __init rs_8xx_init(void)
cp->cp_simode &= ~(0xffff << (idx * 16));
cp->cp_simode |= (i << ((idx * 16) + 12));
cp->cp_simode &= ~(0xffff << (idx * 16));
cp->cp_simode |= (i << ((idx * 16) + 12));
- up->smc_tbase = dp_
addr
;
+ up->smc_tbase = dp_
offset
;
/* Set up the uart parameters in the
* parameter ram.
/* Set up the uart parameters in the
* parameter ram.
@@
-2843,7
+2843,7
@@
module_init(rs_8xx_init);
static int __init serial_console_setup(struct console *co, char *options)
{
struct serial_state *ser;
static int __init serial_console_setup(struct console *co, char *options)
{
struct serial_state *ser;
- uint mem_addr,
dp_addr, bidx, idx
;
+ uint mem_addr,
bidx, idx, dp_offset
;
ushort chan;
volatile cbd_t *bdp;
volatile cpm8xx_t *cp;
ushort chan;
volatile cbd_t *bdp;
volatile cpm8xx_t *cp;
@@
-2889,17
+2889,17
@@
static int __init serial_console_setup(struct console *co, char *options)
* memory yet because vm allocator isn't initialized
* during this early console init.
*/
* memory yet because vm allocator isn't initialized
* during this early console init.
*/
- dp_
addr = m8xx_cpm_dpalloc(
8);
- mem_addr = (uint)(&cpmp->cp_dpmem[dp_
addr
]);
+ dp_
offset = cpm_dpalloc(8,
8);
+ mem_addr = (uint)(&cpmp->cp_dpmem[dp_
offset
]);
/* Allocate space for two buffer descriptors in the DP ram.
*/
/* Allocate space for two buffer descriptors in the DP ram.
*/
- dp_
addr = m8xx_cpm_dpalloc(sizeof(cbd_t) * 2
);
+ dp_
offset = cpm_dpalloc(sizeof(cbd_t) * 2, 8
);
/* Set the physical address of the host memory buffers in
* the buffer descriptors.
*/
/* Set the physical address of the host memory buffers in
* the buffer descriptors.
*/
- bdp = (cbd_t *)&cp->cp_dpmem[dp_
addr
];
+ bdp = (cbd_t *)&cp->cp_dpmem[dp_
offset
];
bdp->cbd_bufaddr = iopa(mem_addr);
(bdp+1)->cbd_bufaddr = iopa(mem_addr+4);
bdp->cbd_bufaddr = iopa(mem_addr);
(bdp+1)->cbd_bufaddr = iopa(mem_addr+4);
@@
-2918,8
+2918,8
@@
static int __init serial_console_setup(struct console *co, char *options)
*/
if (ser->smc_scc_num & NUM_IS_SCC) {
*/
if (ser->smc_scc_num & NUM_IS_SCC) {
- sup->scc_genscc.scc_rbase = dp_
addr
;
- sup->scc_genscc.scc_tbase = dp_
addr
+ sizeof(cbd_t);
+ sup->scc_genscc.scc_rbase = dp_
offset
;
+ sup->scc_genscc.scc_tbase = dp_
offset
+ sizeof(cbd_t);
/* Set up the uart parameters in the
* parameter ram.
/* Set up the uart parameters in the
* parameter ram.
@@
-2977,8
+2977,8
@@
static int __init serial_console_setup(struct console *co, char *options)
}
else {
}
else {
- up->smc_rbase = dp_
addr;
/* Base of receive buffer desc. */
- up->smc_tbase = dp_
addr+sizeof(cbd_t);
/* Base of xmt buffer desc. */
+ up->smc_rbase = dp_
offset;
/* Base of receive buffer desc. */
+ up->smc_tbase = dp_
offset+sizeof(cbd_t);
/* Base of xmt buffer desc. */
up->smc_rfcr = SMC_EB;
up->smc_tfcr = SMC_EB;
up->smc_rfcr = SMC_EB;
up->smc_tfcr = SMC_EB;