1
0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-06 13:09:50 +00:00

Space & alignment nits.

Approved by:	re (scottl)
This commit is contained in:
Roman Kurakin 2005-07-09 13:44:36 +00:00
parent 48281036d7
commit 23f924934d
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=147856
3 changed files with 20 additions and 21 deletions

View File

@ -98,7 +98,6 @@ SYSCTL_INT(_debug_cp, OID_AUTO, mpsafenet, CTLFLAG_RD, &cp_mpsafenet, 0,
mtx_assert (&(_bd)->cp_mtx, MA_OWNED); \ mtx_assert (&(_bd)->cp_mtx, MA_OWNED); \
} while (0) } while (0)
static int cp_probe __P((device_t)); static int cp_probe __P((device_t));
static int cp_attach __P((device_t)); static int cp_attach __P((device_t));
static int cp_detach __P((device_t)); static int cp_detach __P((device_t));
@ -523,20 +522,20 @@ static int cp_attach (device_t dev)
} }
d->ifp->if_softc = d; d->ifp->if_softc = d;
if_initname (d->ifp, "cp", b->num * NCHAN + c->num); if_initname (d->ifp, "cp", b->num * NCHAN + c->num);
d->ifp->if_mtu = PP_MTU; d->ifp->if_mtu = PP_MTU;
d->ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST; d->ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST;
if (!cp_mpsafenet) if (!cp_mpsafenet)
d->ifp->if_flags |= IFF_NEEDSGIANT; d->ifp->if_flags |= IFF_NEEDSGIANT;
d->ifp->if_ioctl = cp_sioctl; d->ifp->if_ioctl = cp_sioctl;
d->ifp->if_start = cp_ifstart; d->ifp->if_start = cp_ifstart;
d->ifp->if_watchdog = cp_ifwatchdog; d->ifp->if_watchdog = cp_ifwatchdog;
d->ifp->if_init = cp_initialize; d->ifp->if_init = cp_initialize;
d->queue.ifq_maxlen = NRBUF; d->queue.ifq_maxlen = NRBUF;
mtx_init (&d->queue.ifq_mtx, "cp_queue", NULL, MTX_DEF); mtx_init (&d->queue.ifq_mtx, "cp_queue", NULL, MTX_DEF);
sppp_attach (d->ifp); sppp_attach (d->ifp);
if_attach (d->ifp); if_attach (d->ifp);
IFP2SP(d->ifp)->pp_tlf = cp_tlf; IFP2SP(d->ifp)->pp_tlf = cp_tlf;
IFP2SP(d->ifp)->pp_tls = cp_tls; IFP2SP(d->ifp)->pp_tls = cp_tls;
/* If BPF is in the kernel, call the attach for it. /* If BPF is in the kernel, call the attach for it.
* The header size of PPP or Cisco/HDLC is 4 bytes. */ * The header size of PPP or Cisco/HDLC is 4 bytes. */
bpfattach (d->ifp, DLT_PPP, 4); bpfattach (d->ifp, DLT_PPP, 4);

View File

@ -741,22 +741,22 @@ static int ct_attach (device_t dev)
ct_bus_dma_mem_free (&d->dmamem); ct_bus_dma_mem_free (&d->dmamem);
continue; continue;
} }
d->ifp->if_softc = d; d->ifp->if_softc = d;
if_initname (d->ifp, "ct", b->num * NCHAN + c->num); if_initname (d->ifp, "ct", b->num * NCHAN + c->num);
d->ifp->if_mtu = PP_MTU; d->ifp->if_mtu = PP_MTU;
d->ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST; d->ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST;
if (!ct_mpsafenet) if (!ct_mpsafenet)
d->ifp->if_flags |= IFF_NEEDSGIANT; d->ifp->if_flags |= IFF_NEEDSGIANT;
d->ifp->if_ioctl = ct_sioctl; d->ifp->if_ioctl = ct_sioctl;
d->ifp->if_start = ct_ifstart; d->ifp->if_start = ct_ifstart;
d->ifp->if_watchdog = ct_ifwatchdog; d->ifp->if_watchdog = ct_ifwatchdog;
d->ifp->if_init = ct_initialize; d->ifp->if_init = ct_initialize;
d->queue.ifq_maxlen = NBUF; d->queue.ifq_maxlen = NBUF;
mtx_init (&d->queue.ifq_mtx, "ct_queue", NULL, MTX_DEF); mtx_init (&d->queue.ifq_mtx, "ct_queue", NULL, MTX_DEF);
sppp_attach (d->ifp); sppp_attach (d->ifp);
if_attach (d->ifp); if_attach (d->ifp);
IFP2SP(d->ifp)->pp_tlf = ct_tlf; IFP2SP(d->ifp)->pp_tlf = ct_tlf;
IFP2SP(d->ifp)->pp_tls = ct_tls; IFP2SP(d->ifp)->pp_tls = ct_tls;
/* If BPF is in the kernel, call the attach for it. /* If BPF is in the kernel, call the attach for it.
* Header size is 4 bytes. */ * Header size is 4 bytes. */
bpfattach (d->ifp, DLT_PPP, 4); bpfattach (d->ifp, DLT_PPP, 4);

View File

@ -848,33 +848,33 @@ static int cx_attach (device_t dev)
cx_bus_dma_mem_free (&d->dmamem); cx_bus_dma_mem_free (&d->dmamem);
continue; continue;
} }
d->ifp->if_softc = d; d->ifp->if_softc = d;
if_initname (d->ifp, "cx", b->num * NCHAN + c->num); if_initname (d->ifp, "cx", b->num * NCHAN + c->num);
d->ifp->if_mtu = PP_MTU; d->ifp->if_mtu = PP_MTU;
d->ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST | d->ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST |
IFF_NEEDSGIANT; IFF_NEEDSGIANT;
d->ifp->if_ioctl = cx_sioctl; d->ifp->if_ioctl = cx_sioctl;
d->ifp->if_start = cx_ifstart; d->ifp->if_start = cx_ifstart;
d->ifp->if_watchdog = cx_ifwatchdog; d->ifp->if_watchdog = cx_ifwatchdog;
d->ifp->if_init = cx_initialize; d->ifp->if_init = cx_initialize;
d->queue.ifq_maxlen = 2; d->queue.ifq_maxlen = 2;
mtx_init (&d->queue.ifq_mtx, "cx_queue", NULL, MTX_DEF); mtx_init (&d->queue.ifq_mtx, "cx_queue", NULL, MTX_DEF);
sppp_attach (d->ifp); sppp_attach (d->ifp);
if_attach (d->ifp); if_attach (d->ifp);
IFP2SP(d->ifp)->pp_tlf = cx_tlf; IFP2SP(d->ifp)->pp_tlf = cx_tlf;
IFP2SP(d->ifp)->pp_tls = cx_tls; IFP2SP(d->ifp)->pp_tls = cx_tls;
/* If BPF is in the kernel, call the attach for it. /* If BPF is in the kernel, call the attach for it.
* Size of PPP header is 4 bytes. */ * Size of PPP header is 4 bytes. */
bpfattach (d->ifp, DLT_PPP, 4); bpfattach (d->ifp, DLT_PPP, 4);
#endif /*NETGRAPH*/ #endif /*NETGRAPH*/
} }
d->tty = ttyalloc (); d->tty = ttyalloc ();
d->tty->t_open = cx_topen; d->tty->t_open = cx_topen;
d->tty->t_close = cx_tclose; d->tty->t_close = cx_tclose;
d->tty->t_param = cx_param; d->tty->t_param = cx_param;
d->tty->t_stop = cx_stop; d->tty->t_stop = cx_stop;
d->tty->t_modem = cx_tmodem; d->tty->t_modem = cx_tmodem;
d->tty->t_sc = d; d->tty->t_sc = d;
CX_LOCK (bd); CX_LOCK (bd);
cx_start_chan (c, d->dmamem.virt, d->dmamem.phys); cx_start_chan (c, d->dmamem.virt, d->dmamem.phys);
cx_register_receive (c, &cx_receive); cx_register_receive (c, &cx_receive);