Fix whitespace usage (fow now, previously existing code only just due to
my time shortage): - Use 8 column for basic indent. - Use 4 space for 2nd level indent. - Use tab instead of 8 spaces. - Don't put space before function call operator. That's unary operator. - Wrap lines so that it fits in 80 columns.
This commit is contained in:
enami
parent
43c3cc6cc0
commit
d483a2c9e2
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: fwohcivar.h,v 1.9 2001/05/01 04:48:11 jmc Exp $ */
|
||||
/* $NetBSD: fwohcivar.h,v 1.10 2001/05/01 06:15:43 enami Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2000 The NetBSD Foundation, Inc.
|
||||
@ -51,7 +51,9 @@
|
||||
#define OHCI_BUF_ATRQ_CNT (8*8)
|
||||
#define OHCI_BUF_ATRS_CNT (8*8)
|
||||
#define OHCI_BUF_IR_CNT 16
|
||||
#define OHCI_BUF_CNT (OHCI_BUF_ARRQ_CNT + OHCI_BUF_ARRS_CNT + OHCI_BUF_ATRQ_CNT + OHCI_BUF_ATRS_CNT + OHCI_BUF_IR_CNT + 1 + 1)
|
||||
#define OHCI_BUF_CNT \
|
||||
(OHCI_BUF_ARRQ_CNT + OHCI_BUF_ARRS_CNT + OHCI_BUF_ATRQ_CNT + \
|
||||
OHCI_BUF_ATRS_CNT + OHCI_BUF_IR_CNT + 1 + 1)
|
||||
|
||||
#define OHCI_LOOP 1000
|
||||
#define OHCI_SELFID_TIMEOUT (hz * 3)
|
||||
@ -79,7 +81,7 @@ struct fwohci_pkt {
|
||||
struct uio fp_uio;
|
||||
struct iovec fp_iov[6];
|
||||
u_int32_t *fp_trail;
|
||||
struct mbuf *fp_m;
|
||||
struct mbuf *fp_m;
|
||||
void (*fp_callback)(struct device *, struct mbuf *);
|
||||
};
|
||||
|
||||
@ -145,14 +147,14 @@ struct fwohci_softc {
|
||||
struct fwohci_ctx **sc_ctx_ir;
|
||||
struct fwohci_buf sc_buf_cnfrom;
|
||||
struct fwohci_buf sc_buf_selfid;
|
||||
|
||||
struct proc *sc_event_thread;
|
||||
|
||||
int sc_dying;
|
||||
u_int32_t sc_intmask;
|
||||
u_int32_t sc_iso;
|
||||
struct proc *sc_event_thread;
|
||||
|
||||
int sc_dying;
|
||||
u_int32_t sc_intmask;
|
||||
u_int32_t sc_iso;
|
||||
|
||||
u_int8_t sc_csr[CSR_SB_END];
|
||||
u_int8_t sc_csr[CSR_SB_END];
|
||||
|
||||
struct fwohci_uidtbl *sc_uidtbl;
|
||||
u_int16_t sc_nodeid; /* Full Node ID of this node */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ieee1394reg.h,v 1.7 2001/05/01 04:48:11 jmc Exp $ */
|
||||
/* $NetBSD: ieee1394reg.h,v 1.8 2001/05/01 06:15:43 enami Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2000 The NetBSD Foundation, Inc.
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
|
||||
#ifndef _DEV_IEEE1394_IEEE1394REG_H_
|
||||
#define _DEV_IEEE1394_IEEE1394REG_H_
|
||||
#define _DEV_IEEE1394_IEEE1394REG_H_
|
||||
|
||||
#include <dev/std/ieee1212reg.h>
|
||||
|
||||
@ -162,7 +162,7 @@ struct ieee1394_async_nodata {
|
||||
/*
|
||||
* Signature
|
||||
*/
|
||||
#define IEEE1394_SIGNATURE 0x31333934
|
||||
#define IEEE1394_SIGNATURE 0x31333934
|
||||
|
||||
/*
|
||||
* Tag value
|
||||
@ -174,7 +174,7 @@ struct ieee1394_async_nodata {
|
||||
*/
|
||||
#define CSR_BASE_HI 0x0000ffff
|
||||
#define CSR_BASE_LO 0xf0000000
|
||||
#define CSR_BASE 0x0000fffff0000000
|
||||
#define CSR_BASE 0x0000fffff0000000
|
||||
|
||||
#define CSR_STATE_CLEAR 0x0000
|
||||
#define CSR_STATE_SET 0x0004
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ieee1394var.h,v 1.5 2001/05/01 04:48:11 jmc Exp $ */
|
||||
/* $NetBSD: ieee1394var.h,v 1.6 2001/05/01 06:15:43 enami Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2000 The NetBSD Foundation, Inc.
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
|
||||
#ifndef _DEV_IEEE1394_IEEE1394VAR_H_
|
||||
#define _DEV_IEEE1394_IEEE1394VAR_H_
|
||||
#define _DEV_IEEE1394_IEEE1394VAR_H_
|
||||
|
||||
struct ieee1394_softc;
|
||||
struct ieee1394_node;
|
||||
@ -50,29 +50,29 @@ struct ieee1394_abuf {
|
||||
struct ieee1394_softc *ab_node; /* destination/source */
|
||||
u_int32_t *ab_data;
|
||||
u_int64_t ab_csr;
|
||||
u_int8_t ab_tcode;
|
||||
u_int8_t ab_tlabel;
|
||||
u_int16_t ab_length;
|
||||
u_int16_t ab_retlen; /* length returned from read. */
|
||||
void (*ab_cb)(struct ieee1394_abuf *, int);
|
||||
void *ab_cbarg;
|
||||
u_int8_t ab_tcode;
|
||||
u_int8_t ab_tlabel;
|
||||
u_int16_t ab_length;
|
||||
u_int16_t ab_retlen; /* length returned from read. */
|
||||
void (*ab_cb)(struct ieee1394_abuf *, int);
|
||||
void *ab_cbarg;
|
||||
};
|
||||
|
||||
struct ieee1394_callbacks {
|
||||
void (*cb1394_busreset) (struct ieee1394_softc *);
|
||||
void (*cb1394_at_queue) (struct ieee1394_softc *, int type,
|
||||
struct ieee1394_abuf *);
|
||||
void (*cb1394_at_done) (struct ieee1394_softc *,
|
||||
struct ieee1394_abuf *);
|
||||
void (*cb1394_busreset)(struct ieee1394_softc *);
|
||||
void (*cb1394_at_queue)(struct ieee1394_softc *, int type,
|
||||
struct ieee1394_abuf *);
|
||||
void (*cb1394_at_done)(struct ieee1394_softc *,
|
||||
struct ieee1394_abuf *);
|
||||
};
|
||||
|
||||
struct ieee1394_attach_args {
|
||||
char name[7];
|
||||
u_int8_t uid[8];
|
||||
u_int16_t nodeid;
|
||||
void *input;
|
||||
void *output;
|
||||
void *inreg;
|
||||
char name[7];
|
||||
u_int8_t uid[8];
|
||||
u_int16_t nodeid;
|
||||
void *input;
|
||||
void *output;
|
||||
void *inreg;
|
||||
};
|
||||
|
||||
struct ieee1394_softc {
|
||||
@ -81,7 +81,7 @@ struct ieee1394_softc {
|
||||
|
||||
const struct ieee1394_callbacks sc1394_callback;
|
||||
u_int32_t *sc1394_configrom;
|
||||
u_int32_t sc1394_configrom_len; /* quadlets. */
|
||||
u_int32_t sc1394_configrom_len; /* quadlets. */
|
||||
u_int32_t sc1394_max_receive;
|
||||
u_int8_t sc1394_guid[8];
|
||||
u_int8_t sc1394_link_speed; /* IEEE1394_SPD_* */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: if_fw.c,v 1.6 2001/05/01 04:18:29 jmc Exp $ */
|
||||
/* $NetBSD: if_fw.c,v 1.7 2001/05/01 06:15:43 enami Exp $ */
|
||||
|
||||
/* XXX ALTQ XXX */
|
||||
|
||||
@ -171,7 +171,8 @@ fw_attach(struct device *parent, struct device *self, void *aux)
|
||||
if_attach(ifp);
|
||||
ieee1394_ifattach(ifp, &sc->sc_ic.ic_hwaddr);
|
||||
(*psc->sc1394_ifinreg)
|
||||
(sc->sc_sc1394.sc1394_dev.dv_parent, FW_FIFO_HI, FW_FIFO_LO, fw_input);
|
||||
(sc->sc_sc1394.sc1394_dev.dv_parent, FW_FIFO_HI, FW_FIFO_LO,
|
||||
fw_input);
|
||||
|
||||
sc->sc_flags |= FWF_ATTACHED;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user