diff options
| author | jhb <jhb@FreeBSD.org> | 2002-11-06 22:58:55 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2002-11-06 22:58:55 +0000 |
| commit | 22de9969b03a4095e7f4ced476b44cbf8940c804 (patch) | |
| tree | b9c644fe435844323fa950fc91719ced8e19e05e | |
| parent | 74e3cefa12c6299ea428f8aee0e5d4d2b3cdbe05 (diff) | |
| download | FreeBSD-src-22de9969b03a4095e7f4ced476b44cbf8940c804.zip FreeBSD-src-22de9969b03a4095e7f4ced476b44cbf8940c804.tar.gz | |
Adjust some casts to quiet warnings.
Reviewed by: mdodd
| -rw-r--r-- | sys/dev/hea/eni_init.c | 2 | ||||
| -rw-r--r-- | sys/dev/hea/eni_receive.c | 8 | ||||
| -rw-r--r-- | sys/dev/hea/eni_transmit.c | 4 | ||||
| -rw-r--r-- | sys/dev/hfa/fore_output.c | 2 | ||||
| -rw-r--r-- | sys/dev/hfa/fore_receive.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/hea/eni_init.c b/sys/dev/hea/eni_init.c index 386e11d..e4c671e 100644 --- a/sys/dev/hea/eni_init.c +++ b/sys/dev/hea/eni_init.c @@ -94,7 +94,7 @@ eni_init ( eup ) for ( order = -1; words; order++ ) words >>= 1; eup->eu_midway[MIDWAY_TXPLACE] = - (order << TXSIZE_SHIFT) | ((int)eup->eu_txbuf >> ENI_LOC_PREDIV); + (order << TXSIZE_SHIFT) | ((intptr_t)eup->eu_txbuf >> ENI_LOC_PREDIV); eup->eu_txpos = eup->eu_midway[MIDWAY_DESCR] & 0x7FFF; /* * Set first word of unack'ed data to start diff --git a/sys/dev/hea/eni_receive.c b/sys/dev/hea/eni_receive.c index a3c1d76..1ad4478 100644 --- a/sys/dev/hea/eni_receive.c +++ b/sys/dev/hea/eni_receive.c @@ -148,8 +148,8 @@ eni_do_service ( eup ) * Find the start of the adapter buffer for this VC. */ rxp = (u_long *) - ((int)(((vci_hdr >> VCI_LOC_SHIFT ) & VCI_LOC_MASK) - << ENI_LOC_PREDIV) + (int)eup->eu_ram); + ((intptr_t)(((vci_hdr >> VCI_LOC_SHIFT ) & VCI_LOC_MASK) + << ENI_LOC_PREDIV) + (intptr_t)eup->eu_ram); /* * Locate incoming VCC for this PDU and find where we * should next read from. @@ -798,7 +798,7 @@ eni_recv_drain ( eup ) KB_DATASTART ( m, up, u_long * ); *((int *)up) = (int)eni_recv_stack; up++; - *((int *)up) = (int)evp; + *((int *)up) = (int)(intptr_t)evp; /* * Schedule callback */ @@ -876,7 +876,7 @@ eni_recv_stack ( tok, m ) * Send the data up the stack */ STACK_CALL ( CPCS_UNITDATA_SIG, evp->ev_upper, - (void *)evp->ev_toku, evp->ev_connvc, (int)m, 0, err ); + (void *)evp->ev_toku, evp->ev_connvc, (intptr_t)m, 0, err ); if ( err ) { KB_FREEALL ( m ); } diff --git a/sys/dev/hea/eni_transmit.c b/sys/dev/hea/eni_transmit.c index 914ef32..8d02f48c 100644 --- a/sys/dev/hea/eni_transmit.c +++ b/sys/dev/hea/eni_transmit.c @@ -483,7 +483,7 @@ retry: * Get start of data onto full-word alignment */ KB_DATASTART ( m, cp, caddr_t ); - if ((align = ((u_int)cp) & (sizeof(u_long)-1)) != 0) { + if ((align = ((uintptr_t)cp) & (sizeof(u_long)-1)) != 0) { /* * Gotta slide the data up */ @@ -748,7 +748,7 @@ retry: */ tx_send = (Eni_mem) ((((int)eup->eu_midway[MIDWAY_TXPLACE] & 0x7ff) << ENI_LOC_PREDIV) + - (int)eup->eu_ram); + (intptr_t)eup->eu_ram); /* * Set descriptor word diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c index 80b53cb..df9f0f9 100644 --- a/sys/dev/hfa/fore_output.c +++ b/sys/dev/hfa/fore_output.c @@ -333,7 +333,7 @@ retry: * Get start of data onto full-word alignment */ KB_DATASTART(m, cp, caddr_t); - if ((align = ((u_int)cp) & (XMIT_SEG_ALIGN - 1)) != 0) { + if ((align = ((uintptr_t)cp) & (XMIT_SEG_ALIGN - 1)) != 0) { /* * Gotta slide the data up */ diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c index 3bcae97..15ccf78 100644 --- a/sys/dev/hfa/fore_receive.c +++ b/sys/dev/hfa/fore_receive.c @@ -544,7 +544,7 @@ fore_recv_stack(tok, m) * Send the data up the stack */ STACK_CALL(CPCS_UNITDATA_SIG, fvp->fv_upper, - fvp->fv_toku, fvp->fv_connvc, (int)m, 0, err); + fvp->fv_toku, fvp->fv_connvc, (intptr_t)m, 0, err); if (err) KB_FREEALL(m); |
