summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/cs/if_cs.c6
-rw-r--r--sys/dev/cy/cy.c54
-rw-r--r--sys/dev/cy/cy_isa.c54
-rw-r--r--sys/dev/ed/if_ed.c6
-rw-r--r--sys/dev/ex/if_ex.c4
-rw-r--r--sys/dev/ie/if_ie.c102
-rw-r--r--sys/dev/kbd/kbdtables.h6
-rw-r--r--sys/dev/syscons/syscons.c4
-rw-r--r--sys/dev/usb/ucom.c8
-rw-r--r--sys/dev/usb/uhid.c4
-rw-r--r--sys/dev/usb/ukbd.c4
-rw-r--r--sys/dev/usb/ulpt.c4
-rw-r--r--sys/dev/usb/umodem.c4
-rw-r--r--sys/dev/usb/ums.c4
14 files changed, 132 insertions, 132 deletions
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index 1ddfbca1..4a9c390 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -27,7 +27,7 @@
*/
/*
- * $Id: if_cs.c,v 1.7 1998/12/07 21:58:21 archie Exp $
+ * $Id: if_cs.c,v 1.8 1999/01/12 00:27:43 eivind Exp $
*
* Device driver for Crystal Semiconductor CS8920 based ethernet
* adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
@@ -1215,11 +1215,11 @@ cs_mediaset(struct cs_softc *sc, int media)
case IFM_AUTO:
if ((error=enable_tp(sc))==0)
error = cs_duplex_auto(sc);
- else if (error=enable_bnc(sc))
+ else if ((error=enable_bnc(sc)) != 0)
error = enable_aui(sc);
break;
case IFM_10_T:
- if (error=enable_tp(sc))
+ if ((error=enable_tp(sc)) != 0)
break;
if (media & IFM_FDX)
cs_duplex_full(sc);
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 794d4d6..e95d7e6 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cy.c,v 1.82 1998/12/24 14:17:57 bde Exp $
+ * $Id: cy.c,v 1.83 1999/01/08 19:17:46 bde Exp $
*/
#include "opt_compat.h"
@@ -924,7 +924,7 @@ comhardclose(com)
enable_intr();
#endif
tp = com->tp;
- if (tp->t_cflag & HUPCL
+ if ((tp->t_cflag & HUPCL)
/*
* XXX we will miss any carrier drop between here and the
* next open. Perhaps we should watch DCD even when the
@@ -932,9 +932,9 @@ comhardclose(com)
* the next open because it might go up and down while
* we're not watching.
*/
- || !com->active_out
+ || (!com->active_out
&& !(com->prev_modem_status & MSR_DCD)
- && !(com->it_in.c_cflag & CLOCAL)
+ && !(com->it_in.c_cflag & CLOCAL))
|| !(tp->t_state & TS_ISOPEN)) {
(void)commctl(com, TIOCM_DTR, DMBIC);
@@ -1107,16 +1107,16 @@ siointr(unit)
*/
if ( com->tp == NULL
|| !(com->tp->t_state & TS_ISOPEN)
- || (line_status & (LSR_PE|LSR_FE))
- && (com->tp->t_iflag & IGNPAR)
- || (line_status & LSR_BI)
- && (com->tp->t_iflag & IGNBRK))
+ || ((line_status & (LSR_PE|LSR_FE))
+ && (com->tp->t_iflag & IGNPAR))
+ || ((line_status & LSR_BI)
+ && (com->tp->t_iflag & IGNBRK)))
goto cont;
if ( (line_status & (LSR_PE|LSR_FE))
&& (com->tp->t_state & TS_CAN_BYPASS_L_RINT)
&& ((line_status & LSR_FE)
- || (line_status & LSR_PE)
- && (com->tp->t_iflag & INPCK)))
+ || ((line_status & LSR_PE)
+ && (com->tp->t_iflag & INPCK))))
recv_data = 0;
}
#endif /* 1 */
@@ -1357,8 +1357,8 @@ cont:
*/
cd_outb(iobase, CD1400_SRER, cy_align,
com->intr_enable
- = com->intr_enable
- & ~CD1400_SRER_TXRDY
+ = (com->intr_enable
+ & ~CD1400_SRER_TXRDY)
| CD1400_SRER_TXMPTY);
goto terminate_tx_service;
}
@@ -1472,8 +1472,8 @@ cont:
cd_outb(iobase, CD1400_SRER, cy_align,
com->intr_enable
- = com->intr_enable
- & ~CD1400_SRER_TXRDY
+ = (com->intr_enable
+ & ~CD1400_SRER_TXRDY)
| CD1400_SRER_TXMPTY);
}
if (!(com->state & CS_ODONE)) {
@@ -2190,13 +2190,13 @@ comparam(tp, t)
if (!(com->intr_enable & CD1400_SRER_TXRDY))
cd_setreg(com, CD1400_SRER,
com->intr_enable
- = com->intr_enable & ~CD1400_SRER_TXMPTY
+ = (com->intr_enable & ~CD1400_SRER_TXMPTY)
| CD1400_SRER_TXRDY);
} else {
if (com->intr_enable & CD1400_SRER_TXRDY)
cd_setreg(com, CD1400_SRER,
com->intr_enable
- = com->intr_enable & ~CD1400_SRER_TXRDY
+ = (com->intr_enable & ~CD1400_SRER_TXRDY)
| CD1400_SRER_TXMPTY);
}
@@ -2232,7 +2232,7 @@ comstart(tp)
if (com->intr_enable & CD1400_SRER_TXRDY)
cd_setreg(com, CD1400_SRER,
com->intr_enable
- = com->intr_enable & ~CD1400_SRER_TXRDY
+ = (com->intr_enable & ~CD1400_SRER_TXRDY)
| CD1400_SRER_TXMPTY);
} else {
com->state |= CS_TTGO;
@@ -2240,7 +2240,7 @@ comstart(tp)
&& !(com->intr_enable & CD1400_SRER_TXRDY))
cd_setreg(com, CD1400_SRER,
com->intr_enable
- = com->intr_enable & ~CD1400_SRER_TXMPTY
+ = (com->intr_enable & ~CD1400_SRER_TXMPTY)
| CD1400_SRER_TXRDY);
}
if (tp->t_state & TS_TBLOCK) {
@@ -2296,8 +2296,8 @@ comstart(tp)
| CS_ODEVREADY))
cd_setreg(com, CD1400_SRER,
com->intr_enable
- = com->intr_enable
- & ~CD1400_SRER_TXMPTY
+ = (com->intr_enable
+ & ~CD1400_SRER_TXMPTY)
| CD1400_SRER_TXRDY);
}
enable_intr();
@@ -2326,8 +2326,8 @@ comstart(tp)
| CS_ODEVREADY))
cd_setreg(com, CD1400_SRER,
com->intr_enable
- = com->intr_enable
- & ~CD1400_SRER_TXMPTY
+ = (com->intr_enable
+ & ~CD1400_SRER_TXMPTY)
| CD1400_SRER_TXRDY);
}
enable_intr();
@@ -2724,19 +2724,19 @@ cd_etc(com, etc)
enable_intr();
goto wait;
}
- if (etc == CD1400_ETC_SENDBREAK
+ if ((etc == CD1400_ETC_SENDBREAK
&& (com->etc == ETC_BREAK_STARTING
- || com->etc == ETC_BREAK_STARTED)
- || etc == CD1400_ETC_STOPBREAK
+ || com->etc == ETC_BREAK_STARTED))
+ || (etc == CD1400_ETC_STOPBREAK
&& (com->etc == ETC_BREAK_ENDING || com->etc == ETC_BREAK_ENDED
- || com->etc == ETC_NONE)) {
+ || com->etc == ETC_NONE))) {
enable_intr();
return;
}
com->etc = etc;
cd_setreg(com, CD1400_SRER,
com->intr_enable
- = com->intr_enable & ~CD1400_SRER_TXRDY | CD1400_SRER_TXMPTY);
+ = (com->intr_enable & ~CD1400_SRER_TXRDY) | CD1400_SRER_TXMPTY);
enable_intr();
wait:
while (com->etc == etc
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 794d4d6..e95d7e6 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cy.c,v 1.82 1998/12/24 14:17:57 bde Exp $
+ * $Id: cy.c,v 1.83 1999/01/08 19:17:46 bde Exp $
*/
#include "opt_compat.h"
@@ -924,7 +924,7 @@ comhardclose(com)
enable_intr();
#endif
tp = com->tp;
- if (tp->t_cflag & HUPCL
+ if ((tp->t_cflag & HUPCL)
/*
* XXX we will miss any carrier drop between here and the
* next open. Perhaps we should watch DCD even when the
@@ -932,9 +932,9 @@ comhardclose(com)
* the next open because it might go up and down while
* we're not watching.
*/
- || !com->active_out
+ || (!com->active_out
&& !(com->prev_modem_status & MSR_DCD)
- && !(com->it_in.c_cflag & CLOCAL)
+ && !(com->it_in.c_cflag & CLOCAL))
|| !(tp->t_state & TS_ISOPEN)) {
(void)commctl(com, TIOCM_DTR, DMBIC);
@@ -1107,16 +1107,16 @@ siointr(unit)
*/
if ( com->tp == NULL
|| !(com->tp->t_state & TS_ISOPEN)
- || (line_status & (LSR_PE|LSR_FE))
- && (com->tp->t_iflag & IGNPAR)
- || (line_status & LSR_BI)
- && (com->tp->t_iflag & IGNBRK))
+ || ((line_status & (LSR_PE|LSR_FE))
+ && (com->tp->t_iflag & IGNPAR))
+ || ((line_status & LSR_BI)
+ && (com->tp->t_iflag & IGNBRK)))
goto cont;
if ( (line_status & (LSR_PE|LSR_FE))
&& (com->tp->t_state & TS_CAN_BYPASS_L_RINT)
&& ((line_status & LSR_FE)
- || (line_status & LSR_PE)
- && (com->tp->t_iflag & INPCK)))
+ || ((line_status & LSR_PE)
+ && (com->tp->t_iflag & INPCK))))
recv_data = 0;
}
#endif /* 1 */
@@ -1357,8 +1357,8 @@ cont:
*/
cd_outb(iobase, CD1400_SRER, cy_align,
com->intr_enable
- = com->intr_enable
- & ~CD1400_SRER_TXRDY
+ = (com->intr_enable
+ & ~CD1400_SRER_TXRDY)
| CD1400_SRER_TXMPTY);
goto terminate_tx_service;
}
@@ -1472,8 +1472,8 @@ cont:
cd_outb(iobase, CD1400_SRER, cy_align,
com->intr_enable
- = com->intr_enable
- & ~CD1400_SRER_TXRDY
+ = (com->intr_enable
+ & ~CD1400_SRER_TXRDY)
| CD1400_SRER_TXMPTY);
}
if (!(com->state & CS_ODONE)) {
@@ -2190,13 +2190,13 @@ comparam(tp, t)
if (!(com->intr_enable & CD1400_SRER_TXRDY))
cd_setreg(com, CD1400_SRER,
com->intr_enable
- = com->intr_enable & ~CD1400_SRER_TXMPTY
+ = (com->intr_enable & ~CD1400_SRER_TXMPTY)
| CD1400_SRER_TXRDY);
} else {
if (com->intr_enable & CD1400_SRER_TXRDY)
cd_setreg(com, CD1400_SRER,
com->intr_enable
- = com->intr_enable & ~CD1400_SRER_TXRDY
+ = (com->intr_enable & ~CD1400_SRER_TXRDY)
| CD1400_SRER_TXMPTY);
}
@@ -2232,7 +2232,7 @@ comstart(tp)
if (com->intr_enable & CD1400_SRER_TXRDY)
cd_setreg(com, CD1400_SRER,
com->intr_enable
- = com->intr_enable & ~CD1400_SRER_TXRDY
+ = (com->intr_enable & ~CD1400_SRER_TXRDY)
| CD1400_SRER_TXMPTY);
} else {
com->state |= CS_TTGO;
@@ -2240,7 +2240,7 @@ comstart(tp)
&& !(com->intr_enable & CD1400_SRER_TXRDY))
cd_setreg(com, CD1400_SRER,
com->intr_enable
- = com->intr_enable & ~CD1400_SRER_TXMPTY
+ = (com->intr_enable & ~CD1400_SRER_TXMPTY)
| CD1400_SRER_TXRDY);
}
if (tp->t_state & TS_TBLOCK) {
@@ -2296,8 +2296,8 @@ comstart(tp)
| CS_ODEVREADY))
cd_setreg(com, CD1400_SRER,
com->intr_enable
- = com->intr_enable
- & ~CD1400_SRER_TXMPTY
+ = (com->intr_enable
+ & ~CD1400_SRER_TXMPTY)
| CD1400_SRER_TXRDY);
}
enable_intr();
@@ -2326,8 +2326,8 @@ comstart(tp)
| CS_ODEVREADY))
cd_setreg(com, CD1400_SRER,
com->intr_enable
- = com->intr_enable
- & ~CD1400_SRER_TXMPTY
+ = (com->intr_enable
+ & ~CD1400_SRER_TXMPTY)
| CD1400_SRER_TXRDY);
}
enable_intr();
@@ -2724,19 +2724,19 @@ cd_etc(com, etc)
enable_intr();
goto wait;
}
- if (etc == CD1400_ETC_SENDBREAK
+ if ((etc == CD1400_ETC_SENDBREAK
&& (com->etc == ETC_BREAK_STARTING
- || com->etc == ETC_BREAK_STARTED)
- || etc == CD1400_ETC_STOPBREAK
+ || com->etc == ETC_BREAK_STARTED))
+ || (etc == CD1400_ETC_STOPBREAK
&& (com->etc == ETC_BREAK_ENDING || com->etc == ETC_BREAK_ENDED
- || com->etc == ETC_NONE)) {
+ || com->etc == ETC_NONE))) {
enable_intr();
return;
}
com->etc = etc;
cd_setreg(com, CD1400_SRER,
com->intr_enable
- = com->intr_enable & ~CD1400_SRER_TXRDY | CD1400_SRER_TXMPTY);
+ = (com->intr_enable & ~CD1400_SRER_TXRDY) | CD1400_SRER_TXMPTY);
enable_intr();
wait:
while (com->etc == etc
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 9133a48..e7bab24 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ed.c,v 1.147 1998/12/13 23:00:48 eivind Exp $
+ * $Id: if_ed.c,v 1.148 1999/01/19 00:21:38 peter Exp $
*/
/*
@@ -3211,7 +3211,7 @@ ed_hpp_write_mbufs(struct ed_softc *sc, struct mbuf *m, int dst)
len &= 1;
}
/* save last byte if needed */
- if (wantbyte = (len == 1))
+ if ((wantbyte = (len == 1)) != 0)
savebyte[0] = *data;
}
m = m->m_next; /* to next mbuf */
@@ -3247,7 +3247,7 @@ ed_hpp_write_mbufs(struct ed_softc *sc, struct mbuf *m, int dst)
data += (len & ~1);
len &= 1;
}
- if (wantbyte = (len == 1))
+ if ((wantbyte = (len == 1)) != 0)
savebyte[0] = *data;
} /* if len != 0 */
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index 2508bd7..0b689be 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ex.c,v 1.12 1998/06/07 17:10:30 dfr Exp $
+ * $Id: if_ex.c,v 1.13 1998/10/22 05:58:39 bde Exp $
*/
/*
@@ -476,7 +476,7 @@ void ex_start(struct ifnet *ifp)
outsw(iobase + IO_PORT_REG, tmp16, 1);
}
outsw(iobase + IO_PORT_REG, mtod(m, caddr_t) + i, (m->m_len - i) / 2);
- if (i = (m->m_len - i) & 1)
+ if ((i = (m->m_len - i) & 1) != 0)
tmp16[0] = *(mtod(m, caddr_t) + m->m_len - 1);
}
if (i)
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 4b22ae5..06db700 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ie.c,v 1.57 1998/10/22 05:58:39 bde Exp $
+ * $Id: if_ie.c,v 1.58 1998/12/10 01:49:49 archie Exp $
*/
/*
@@ -211,15 +211,15 @@ static void find_ie_mem_size(int unit);
static void chan_attn_timeout(void *rock);
static int command_and_wait(int unit, int command,
void volatile * pcmd, int);
-static void run_tdr(int unit, struct ie_tdr_cmd * cmd);
+static void run_tdr(int unit, volatile struct ie_tdr_cmd * cmd);
static int ierint(int unit, struct ie_softc * ie);
static int ietint(int unit, struct ie_softc * ie);
static int iernr(int unit, struct ie_softc * ie);
static void start_receiver(int unit);
static __inline int ieget(int, struct ie_softc *, struct mbuf **,
struct ether_header *, int *);
-static caddr_t setup_rfa(caddr_t ptr, struct ie_softc * ie);
-static int mc_setup(int, caddr_t, volatile struct ie_sys_ctl_block *);
+static v_caddr_t setup_rfa(v_caddr_t ptr, struct ie_softc * ie);
+static int mc_setup(int, v_caddr_t, volatile struct ie_sys_ctl_block *);
static void ie_mc_reset(int unit);
#ifdef DEBUG
@@ -317,7 +317,7 @@ static struct ie_softc {
volatile struct ie_xmit_cmd **xmit_cmds; /* ntxbufs worth */
volatile struct ie_xmit_buf **xmit_buffs; /* ntxbufs worth */
- u_char **xmit_cbuffs; /* ntxbufs worth */
+ volatile u_char **xmit_cbuffs; /* ntxbufs worth */
int xmit_count;
struct ie_en_addr mcast_addrs[MAXMCAST + 1];
@@ -820,7 +820,7 @@ ieattach(struct isa_device *dvp)
(volatile struct ie_xmit_cmd **)&ie->cbuffs[ie->nrxbufs];
ie->xmit_buffs =
(volatile struct ie_xmit_buf **)&ie->xmit_cmds[ie->ntxbufs];
- ie->xmit_cbuffs = (u_char **)&ie->xmit_buffs[ie->ntxbufs];
+ ie->xmit_cbuffs = (volatile u_char **)&ie->xmit_buffs[ie->ntxbufs];
ifp->if_softc = ie;
ifp->if_unit = unit;
@@ -1017,7 +1017,7 @@ ietint(int unit, struct ie_softc *ie)
* that we should do it.
*/
if (ie->want_mcsetup) {
- mc_setup(unit, (caddr_t) ie->xmit_cbuffs[0], ie->scb);
+ mc_setup(unit, (v_caddr_t) ie->xmit_cbuffs[0], ie->scb);
ie->want_mcsetup = 0;
}
/* Wish I knew why this seems to be necessary... */
@@ -1036,14 +1036,14 @@ static int
iernr(int unit, struct ie_softc *ie)
{
#ifdef doesnt_work
- setup_rfa((caddr_t) ie->rframes[0], ie);
+ setup_rfa((v_caddr_t) ie->rframes[0], ie);
ie->scb->ie_recv_list = MK_16(MEM, ie_softc[unit].rframes[0]);
command_and_wait(unit, IE_RU_START, 0, 0);
#else
/* This doesn't work either, but it doesn't hang either. */
command_and_wait(unit, IE_RU_DISABLE, 0, 0); /* just in case */
- setup_rfa((caddr_t) ie->rframes[0], ie); /* ignore cast-qual */
+ setup_rfa((v_caddr_t) ie->rframes[0], ie); /* ignore cast-qual */
ie->scb->ie_recv_list = MK_16(MEM, ie_softc[unit].rframes[0]);
command_and_wait(unit, IE_RU_START, 0, 0); /* was ENABLE */
@@ -1260,7 +1260,7 @@ ieget(int unit, struct ie_softc *ie, struct mbuf **mp,
/*
* Snarf the Ethernet header.
*/
- bcopy((caddr_t) ie->cbuffs[i], (caddr_t) ehp, sizeof *ehp);
+ bcopy((v_caddr_t) ie->cbuffs[i], (caddr_t) ehp, sizeof *ehp);
/* ignore cast-qual warning here */
/*
@@ -1348,8 +1348,8 @@ ieget(int unit, struct ie_softc *ie, struct mbuf **mp,
if (thislen > m->m_len - thismboff) {
int newlen = m->m_len - thismboff;
- bcopy((caddr_t) (ie->cbuffs[head] + offset),
- mtod(m, caddr_t) +thismboff, (unsigned) newlen);
+ bcopy((v_caddr_t) (ie->cbuffs[head] + offset),
+ mtod(m, v_caddr_t) +thismboff, (unsigned) newlen);
/* ignore cast-qual warning */
m = m->m_next;
thismboff = 0; /* new mbuf, so no offset */
@@ -1365,7 +1365,7 @@ ieget(int unit, struct ie_softc *ie, struct mbuf **mp,
* pointers, and so on.
*/
if (thislen < m->m_len - thismboff) {
- bcopy((caddr_t) (ie->cbuffs[head] + offset),
+ bcopy((v_caddr_t) (ie->cbuffs[head] + offset),
mtod(m, caddr_t) +thismboff, (unsigned) thislen);
thismboff += thislen; /* we are this far into the
* mbuf */
@@ -1377,7 +1377,7 @@ ieget(int unit, struct ie_softc *ie, struct mbuf **mp,
* buffer's contents into the current mbuf. Do the
* combination of the above actions.
*/
- bcopy((caddr_t) (ie->cbuffs[head] + offset),
+ bcopy((v_caddr_t) (ie->cbuffs[head] + offset),
mtod(m, caddr_t) + thismboff, (unsigned) thislen);
m = m->m_next;
thismboff = 0; /* new mbuf, start at the beginning */
@@ -1425,7 +1425,7 @@ ie_readframe(int unit, struct ie_softc *ie, int num/* frame number to read */)
#endif
- bcopy((caddr_t) (ie->rframes[num]), &rfd,
+ bcopy((v_caddr_t) (ie->rframes[num]), &rfd,
sizeof(struct ie_recv_frame_desc));
/*
@@ -1547,7 +1547,7 @@ iestart(struct ifnet *ifp)
{
struct ie_softc *ie = ifp->if_softc;
struct mbuf *m0, *m;
- unsigned char *buffer;
+ volatile unsigned char *buffer;
u_short len;
/*
@@ -1585,7 +1585,7 @@ iestart(struct ifnet *ifp)
*/
if (ie->arpcom.ac_if.if_bpf)
bpf_tap(&ie->arpcom.ac_if,
- ie->xmit_cbuffs[ie->xmit_count], len);
+ (void *)ie->xmit_cbuffs[ie->xmit_count], len);
#endif
ie->xmit_buffs[ie->xmit_count]->ie_xmit_flags =
@@ -1640,7 +1640,7 @@ check_ie_present(int unit, caddr_t where, unsigned size)
scp = (volatile struct ie_sys_conf_ptr *) (uintptr_t)
(realbase + IE_SCP_ADDR);
- bzero((char *) scp, sizeof *scp);
+ bzero((volatile char *) scp, sizeof *scp);
/*
* First we put the ISCP at the bottom of memory; this tests to make
@@ -1649,13 +1649,13 @@ check_ie_present(int unit, caddr_t where, unsigned size)
* operation.
*/
iscp = (volatile struct ie_int_sys_conf_ptr *) where;
- bzero((char *)iscp, sizeof *iscp);
+ bzero((volatile char *)iscp, sizeof *iscp);
scb = (volatile struct ie_sys_ctl_block *) where;
- bzero((char *)scb, sizeof *scb);
+ bzero((volatile char *)scb, sizeof *scb);
scp->ie_bus_use = ie_softc[unit].bus_use; /* 8-bit or 16-bit */
- scp->ie_iscp_ptr = (caddr_t) ((volatile caddr_t) iscp -
+ scp->ie_iscp_ptr = (v_caddr_t) ((volatile caddr_t) iscp -
(volatile caddr_t) (volatile uintptr_t)
realbase);
@@ -1678,10 +1678,10 @@ check_ie_present(int unit, caddr_t where, unsigned size)
iscp = (void *) Align((caddr_t) (uintptr_t)
(realbase + IE_SCP_ADDR -
sizeof(struct ie_int_sys_conf_ptr)));
- bzero((char *) iscp, sizeof *iscp); /* ignore cast-qual */
+ bzero((volatile char *) iscp, sizeof *iscp); /* ignore cast-qual */
- scp->ie_iscp_ptr = (caddr_t) ((caddr_t) iscp -
- (caddr_t) (uintptr_t) realbase);
+ scp->ie_iscp_ptr = (v_caddr_t) ((v_caddr_t) iscp -
+ (v_caddr_t) (uintptr_t) realbase);
/* ignore cast-qual */
iscp->ie_busy = 1;
@@ -1973,7 +1973,7 @@ command_and_wait(int unit, int cmd, volatile void *pcmd, int mask)
* Run the time-domain reflectometer...
*/
static void
-run_tdr(int unit, struct ie_tdr_cmd *cmd)
+run_tdr(int unit, volatile struct ie_tdr_cmd *cmd)
{
int result;
@@ -2026,10 +2026,10 @@ start_receiver(int unit)
* Here is a helper routine for iernr() and ieinit(). This sets up
* the RFA.
*/
-static caddr_t
-setup_rfa(caddr_t ptr, struct ie_softc * ie)
+static v_caddr_t
+setup_rfa(v_caddr_t ptr, struct ie_softc * ie)
{
- volatile struct ie_recv_frame_desc *rfd = (void *) ptr;
+ volatile struct ie_recv_frame_desc *rfd = (volatile void *)ptr;
volatile struct ie_recv_buf_desc *rbd;
int i;
int unit = ie - &ie_softc[0];
@@ -2037,11 +2037,11 @@ setup_rfa(caddr_t ptr, struct ie_softc * ie)
/* First lay them out */
for (i = 0; i < ie->nframes; i++) {
ie->rframes[i] = rfd;
- bzero((char *) rfd, sizeof *rfd); /* ignore cast-qual */
+ bzero((volatile char *) rfd, sizeof *rfd); /* ignore cast-qual */
rfd++;
}
- ptr = (caddr_t) Align((caddr_t) rfd); /* ignore cast-qual */
+ ptr = (v_caddr_t) Align((v_caddr_t) rfd); /* ignore cast-qual */
/* Now link them together */
for (i = 0; i < ie->nframes; i++) {
@@ -2057,17 +2057,17 @@ setup_rfa(caddr_t ptr, struct ie_softc * ie)
* set aside a bit of slop in each buffer, to make sure that we have
* enough space to hold a single frame in every buffer.
*/
- rbd = (void *) ptr;
+ rbd = (volatile void *) ptr;
for (i = 0; i < ie->nrxbufs; i++) {
ie->rbuffs[i] = rbd;
- bzero((char *)rbd, sizeof *rbd);
+ bzero((volatile char *)rbd, sizeof *rbd);
ptr = (caddr_t) Align(ptr + sizeof *rbd);
rbd->ie_rbd_length = IE_RBUF_SIZE;
rbd->ie_rbd_buffer = MK_24(MEM, ptr);
- ie->cbuffs[i] = (void *) ptr;
+ ie->cbuffs[i] = (volatile void *) ptr;
ptr += IE_RBUF_SIZE;
- rbd = (void *) ptr;
+ rbd = (volatile void *) ptr;
}
/* Now link them together */
@@ -2100,18 +2100,18 @@ setup_rfa(caddr_t ptr, struct ie_softc * ie)
* Call at splimp().
*/
static int
-mc_setup(int unit, caddr_t ptr,
+mc_setup(int unit, v_caddr_t ptr,
volatile struct ie_sys_ctl_block * scb)
{
struct ie_softc *ie = &ie_softc[unit];
- volatile struct ie_mcast_cmd *cmd = (void *) ptr;
+ volatile struct ie_mcast_cmd *cmd = (volatile void *) ptr;
cmd->com.ie_cmd_status = 0;
cmd->com.ie_cmd_cmd = IE_CMD_MCAST | IE_CMD_LAST;
cmd->com.ie_cmd_link = 0xffff;
/* ignore cast-qual */
- bcopy((caddr_t) ie->mcast_addrs, (caddr_t) cmd->ie_mcast_addrs,
+ bcopy((v_caddr_t) ie->mcast_addrs, (v_caddr_t) cmd->ie_mcast_addrs,
ie->mcast_count * sizeof *ie->mcast_addrs);
cmd->ie_mcast_bytes = ie->mcast_count * 6; /* grrr... */
@@ -2138,16 +2138,16 @@ ieinit(int unit)
{
struct ie_softc *ie = &ie_softc[unit];
volatile struct ie_sys_ctl_block *scb = ie->scb;
- caddr_t ptr;
+ v_caddr_t ptr;
int i;
- ptr = (caddr_t) Align((caddr_t) scb + sizeof *scb);
+ ptr = (v_caddr_t) Align((v_caddr_t) scb + sizeof *scb);
/*
* Send the configure command first.
*/
{
- volatile struct ie_config_cmd *cmd = (void *) ptr;
+ volatile struct ie_config_cmd *cmd = (volatile void *) ptr;
ie_setup_config(cmd, ie->promisc,
ie->hard_type == IE_STARLAN10);
@@ -2167,14 +2167,14 @@ ieinit(int unit)
* Now send the Individual Address Setup command.
*/
{
- volatile struct ie_iasetup_cmd *cmd = (void *) ptr;
+ volatile struct ie_iasetup_cmd *cmd = (volatile void *) ptr;
cmd->com.ie_cmd_status = 0;
cmd->com.ie_cmd_cmd = IE_CMD_IASETUP | IE_CMD_LAST;
cmd->com.ie_cmd_link = 0xffff;
- bcopy((char *)ie_softc[unit].arpcom.ac_enaddr,
- (char *)&cmd->ie_address, sizeof cmd->ie_address);
+ bcopy((volatile char *)ie_softc[unit].arpcom.ac_enaddr,
+ (volatile char *)&cmd->ie_address, sizeof cmd->ie_address);
scb->ie_command_list = MK_16(MEM, cmd);
if (command_and_wait(unit, IE_CU_START, cmd, IE_STAT_COMPL)
|| !(cmd->com.ie_cmd_status & IE_STAT_OK)) {
@@ -2187,7 +2187,7 @@ ieinit(int unit)
/*
* Now run the time-domain reflectometer.
*/
- run_tdr(unit, (void *) ptr);
+ run_tdr(unit, (volatile void *) ptr);
/*
* Acknowledge any interrupts we have generated thus far.
@@ -2206,25 +2206,25 @@ ieinit(int unit)
/* transmit command buffers */
for (i = 0; i < ie->ntxbufs; i++) {
- ie->xmit_cmds[i] = (void *) ptr;
+ ie->xmit_cmds[i] = (volatile void *) ptr;
ptr += sizeof *ie->xmit_cmds[i];
ptr = Align(ptr);
- ie->xmit_buffs[i] = (void *)ptr;
+ ie->xmit_buffs[i] = (volatile void *)ptr;
ptr += sizeof *ie->xmit_buffs[i];
ptr = Align(ptr);
}
/* transmit buffers */
for (i = 0; i < ie->ntxbufs - 1; i++) {
- ie->xmit_cbuffs[i] = (void *)ptr;
+ ie->xmit_cbuffs[i] = (volatile void *)ptr;
ptr += IE_BUF_LEN;
ptr = Align(ptr);
}
- ie->xmit_cbuffs[ie->ntxbufs - 1] = (void *) ptr;
+ ie->xmit_cbuffs[ie->ntxbufs - 1] = (volatile void *) ptr;
for (i = 1; i < ie->ntxbufs; i++) {
- bzero((caddr_t) ie->xmit_cmds[i], sizeof *ie->xmit_cmds[i]);
- bzero((caddr_t) ie->xmit_buffs[i], sizeof *ie->xmit_buffs[i]);
+ bzero((v_caddr_t) ie->xmit_cmds[i], sizeof *ie->xmit_cmds[i]);
+ bzero((v_caddr_t) ie->xmit_buffs[i], sizeof *ie->xmit_buffs[i]);
}
/*
@@ -2426,7 +2426,7 @@ print_rbd(volatile struct ie_recv_buf_desc * rbd)
printf("RBD at %p:\n"
"actual %04x, next %04x, buffer %p\n"
"length %04x, mbz %04x\n",
- (void *) rbd,
+ (volatile void *) rbd,
rbd->ie_rbd_actual, rbd->ie_rbd_next,
(void *) rbd->ie_rbd_buffer,
rbd->ie_rbd_length, rbd->mbz);
diff --git a/sys/dev/kbd/kbdtables.h b/sys/dev/kbd/kbdtables.h
index c0d4663..8327182 100644
--- a/sys/dev/kbd/kbdtables.h
+++ b/sys/dev/kbd/kbdtables.h
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: kbdtables.h,v 1.41 1998/09/15 18:16:37 sos Exp $
+ * $Id: kbdtables.h,v 1.42 1998/11/18 08:33:58 kato Exp $
*/
#define SET8 0x80 /* set eight bit on */
@@ -1132,7 +1132,7 @@ static keymap_t key_map = { 0x6C, /* icelandic iso8859 keymap */
#if !defined(DKKEYMAP) && !defined(UKKEYMAP) && !defined(GRKEYMAP) && !defined(SWKEYMAP) && !defined(RUKEYMAP) && !defined(ISKEYMAP) && !defined(ESKEYMAP) && !defined(PC98)
#define ISO_ACCENTCHARS
-static keymap_t key_map = { 0x6C, /* US iso8859 keymap */
+static keymap_t key_map = { 0x6C, { /* US iso8859 keymap */
/* alt
* scan cntrl alt alt cntrl
* code base shift cntrl shift alt shift cntrl shift spcl flgs
@@ -1246,7 +1246,7 @@ static keymap_t key_map = { 0x6C, /* US iso8859 keymap */
/* sc=69 */ F(62), F(62), F(62), F(62), F(62), F(62), F(62), F(62), 0xFF, 0x00,
/* sc=6a */ F(63), F(63), F(63), F(63), F(63), F(63), F(63), F(63), 0xFF, 0x00,
/* sc=6b */ F(64), F(64), F(64), F(64), F(64), F(64), F(64), F(64), 0xFF, 0x00,
-};
+} };
#endif
#if defined(NO_ACCENTCHARS)
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index cfde5f0..e269df0 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: syscons.c,v 1.293 1999/01/19 11:31:18 yokota Exp $
+ * $Id: syscons.c,v 1.294 1999/01/26 09:58:37 yokota Exp $
*/
#include "sc.h"
@@ -438,7 +438,7 @@ draw_cursor_image(scr_stat *scp)
cursor_image |= DEAD_CHAR;
}
} else {
- cursor_image = (readw(ptr) & 0x00ff) | *(scp->cursor_pos) & 0xff00;
+ cursor_image = (readw(ptr) & 0x00ff) | (*(scp->cursor_pos) & 0xff00);
scp->cursor_saveunder = cursor_image;
if (!(sc_flags & BLINK_CURSOR)||((sc_flags & BLINK_CURSOR)&&(blinkrate & 4))){
if ((cursor_image & 0x7000) == 0x7000) {
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index b0fb1a7..7724ece 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -96,8 +96,8 @@ USB_MATCH(ucom)
if (!uaa->iface)
return (UMATCH_NONE);
id = usbd_get_interface_descriptor(uaa->iface);
- if (id &&
- id->bInterfaceClass != UCLASS_CDC ||
+ if ((id &&
+ id->bInterfaceClass != UCLASS_CDC) ||
id->bInterfaceSubClass != USUBCLASS_ABSTRACT_CONTROL_MODEL)
return (UMATCH_NONE);
return (UMATCH_IFACECLASS_IFACESUBCLASS);
@@ -124,12 +124,12 @@ USB_ATTACH(ucom)
static int
ucom_detach(device_t self)
{
- char *devinfo = (char *) device_get_desc(self);
+ const char *devinfo = device_get_desc(self);
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
if (devinfo) {
device_set_desc(self, NULL);
- free(devinfo, M_USB);
+ free((void *)devinfo, M_USB);
}
return 0;
}
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 2f2fdb1..a34ee70 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -200,12 +200,12 @@ USB_ATTACH(uhid)
static int
uhid_detach(device_t self)
{
- char *devinfo = (char *) device_get_desc(self);
+ const char *devinfo = device_get_desc(self);
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
if (devinfo) {
device_set_desc(self, NULL);
- free(devinfo, M_USB);
+ free((void *)devinfo, M_USB);
}
return 0;
}
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 6bb1731..194afb4 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -362,7 +362,7 @@ int
ukbd_detach(device_t self)
{
struct ukbd_softc *sc = device_get_softc(self);
- char *devinfo = (char *) device_get_desc(self);
+ const char *devinfo = device_get_desc(self);
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
if (sc->sc_enabled)
@@ -370,7 +370,7 @@ ukbd_detach(device_t self)
if (devinfo) {
device_set_desc(self, NULL);
- free(devinfo, M_USB);
+ free((void *)devinfo, M_USB);
}
return (0);
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 29e413f..ed7b2f3 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -437,12 +437,12 @@ ulptioctl(dev, cmd, data, flag, p)
static int
ulpt_detach(device_t self)
{
- char *devinfo = (char *) device_get_desc(self);
+ const char *devinfo = device_get_desc(self);
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
if (devinfo) {
device_set_desc(self, NULL);
- free(devinfo, M_USB);
+ free((void *)devinfo, M_USB);
}
return 0;
}
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index bbc162e..4ec326e 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -125,12 +125,12 @@ USB_ATTACH(umodem)
static int
umodem_detach(device_t self)
{
- char *devinfo = (char *) device_get_desc(self);
+ const char *devinfo = device_get_desc(self);
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
if (devinfo) {
device_set_desc(self, NULL);
- free(devinfo, M_USB);
+ free((void *)devinfo, M_USB);
}
return 0;
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index ac0ad99..b686f9f 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -375,7 +375,7 @@ static int
ums_detach(device_t self)
{
struct ums_softc *sc = device_get_softc(self);
- char *devinfo = (char *) device_get_desc(self);
+ const char *devinfo = device_get_desc(self);
if (sc->sc_enabled) {
usbd_abort_pipe(sc->sc_intrpipe);
@@ -386,7 +386,7 @@ ums_detach(device_t self)
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
if (devinfo) {
device_set_desc(self, NULL);
- free(devinfo, M_USB);
+ free((void *)devinfo, M_USB);
}
free(sc->sc_loc_btn, M_USB);
free(sc->sc_ibuf, M_USB);
OpenPOWER on IntegriCloud