Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make it compilable:

Browse Source 
fw_verbose, fw_dump -> fwdebug (DPRINTFN)
	add sc1394_ifsetiso into ieee1394_softc
This commit is contained in:
onoe 2001-07-18 02:59:54 +00:00
parent 69b6def907
commit b7ff292c17
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/dev/ieee1394/fwohci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fwohci.c,v 1.40 2001/07/17 11:01:03 haya Exp $ */ /* $NetBSD: fwohci.c,v 1.41 2001/07/18 02:59:54 onoe Exp $ */
#define DOUBLEBUF 1 #define DOUBLEBUF 1
#define NO_THREAD 1 #define NO_THREAD 1
@ -157,7 +157,7 @@ static int fwohci_if_input(struct fwohci_softc *, void *, struct fwohci_pkt *);
static int fwohci_if_input_iso(struct fwohci_softc *, void *, struct fwohci_pkt *); static int fwohci_if_input_iso(struct fwohci_softc *, void *, struct fwohci_pkt *);
static int fwohci_if_output(struct device *, struct mbuf *, static int fwohci_if_output(struct device *, struct mbuf *,
void (*)(struct device *, struct mbuf *)); void (*)(struct device *, struct mbuf *));
static int fwohci_if_setiso(struct device *, int, int, int, static int fwohci_if_setiso(struct device *, u_int32_t, u_int32_t, u_int32_t,
void (*)(struct device *, struct mbuf *)); void (*)(struct device *, struct mbuf *));
static int fwohci_read(struct ieee1394_abuf *); static int fwohci_read(struct ieee1394_abuf *);
static int fwohci_write(struct ieee1394_abuf *); static int fwohci_write(struct ieee1394_abuf *);
@ -279,8 +279,8 @@ fwohci_init(struct fwohci_softc *sc, const struct evcnt *ev)
} }
static int static int
fwohci_if_setiso(struct device *self, int channel, int tag, int direction, fwohci_if_setiso(struct device *self, u_int32_t channel, u_int32_t tag,
void (*handler)(struct device *, struct mbuf *)) u_int32_t direction, void (*handler)(struct device *, struct mbuf *))
{ {
struct fwohci_softc *sc = (struct fwohci_softc *)self; struct fwohci_softc *sc = (struct fwohci_softc *)self;
int retval; int retval;
@ -2842,29 +2842,28 @@ fwohci_if_input_iso(struct fwohci_softc *sc, void *arg, struct fwohci_pkt *pkt)
struct mbuf *m; struct mbuf *m;
struct iovec *iov; struct iovec *iov;
void (*handler)(struct device *, struct mbuf *) = arg; void (*handler)(struct device *, struct mbuf *) = arg;
#ifdef FW_DEBUG
int i;
#endif
chan = (pkt->fp_hdr[0] & 0x00003f00) >> 8; chan = (pkt->fp_hdr[0] & 0x00003f00) >> 8;
tag = (pkt->fp_hdr[0] & 0x0000c000) >> 14; tag = (pkt->fp_hdr[0] & 0x0000c000) >> 14;
#ifdef FW_DEBUG #ifdef FW_DEBUG
if (fw_verbose) { DPRINTFN(1, ("fwohci_if_input_iso: "
int i; "tcode=0x%x, chan=%d, tag=%x, dlen=%d",
printf("fwohci_if_input_iso: tcode=0x%x, chan=%d, tag=%x, dlen=%d", pkt->fp_tcode, chan, tag, pkt->fp_dlen));
pkt->fp_tcode, chan, tag, pkt->fp_dlen);
if (fw_dump) {
for (i = 0; i < pkt->fp_hlen/4; i++) for (i = 0; i < pkt->fp_hlen/4; i++)
printf("%s%08x", i?" ":"\n\t", pkt->fp_hdr[i]); DPRINTFN(2, ("%s%08x", i?" ":"\n\t", pkt->fp_hdr[i]));
printf("$"); DPRINTFN(2, ("$"));
for (n = 0, len = pkt->fp_dlen; len > 0; len -= i, n++){ for (n = 0, len = pkt->fp_dlen; len > 0; len -= i, n++){
iov = &pkt->fp_iov[n]; iov = &pkt->fp_iov[n];
for (i = 0; i < iov->iov_len; i++) for (i = 0; i < iov->iov_len; i++)
printf("%s%02x", DPRINTFN(2, ("%s%02x",
(i%32)?((i%4)?"":" "):"\n\t", (i%32)?((i%4)?"":" "):"\n\t",
((u_int8_t *)iov->iov_base)[i]); ((u_int8_t *)iov->iov_base)[i]));
printf("$"); DPRINTFN(2, ("$"));
}
}
printf("\n");
} }
DPRINTFN(2, ("\n"));
#endif /* FW_DEBUG */ #endif /* FW_DEBUG */
len = pkt->fp_dlen; len = pkt->fp_dlen;
MGETHDR(m, M_DONTWAIT, MT_DATA); MGETHDR(m, M_DONTWAIT, MT_DATA);

4
sys/dev/ieee1394/ieee1394var.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ieee1394var.h,v 1.12 2001/05/15 06:52:30 jmc Exp $ */ /* $NetBSD: ieee1394var.h,v 1.13 2001/07/18 02:59:54 onoe Exp $ */
/*- /*-
* Copyright (c) 2000 The NetBSD Foundation, Inc. * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -93,6 +93,8 @@ struct ieee1394_softc {
void (*)(struct device *, struct mbuf *)); /* Nuke. */ void (*)(struct device *, struct mbuf *)); /* Nuke. */
int (*sc1394_ifinreg)(struct device *, u_int32_t, u_int32_t, int (*sc1394_ifinreg)(struct device *, u_int32_t, u_int32_t,
void (*)(struct device *, struct mbuf *)); /* Nuke */ void (*)(struct device *, struct mbuf *)); /* Nuke */
int (*sc1394_ifsetiso)(struct device *, u_int32_t, u_int32_t, u_int32_t,
void (*)(struct device *, struct mbuf *)); /* Nuke */
LIST_ENTRY(ieee1394_softc) sc1394_node; LIST_ENTRY(ieee1394_softc) sc1394_node;
}; };