[Midnightbsd-cvs] src: dev/pdq: fix preprocessor checks, gcc4 fixes, etc
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Mar 29 12:56:32 EDT 2009
Log Message:
-----------
fix preprocessor checks, gcc4 fixes, etc
Modified Files:
--------------
src/sys/dev/pdq:
if_fea.c (r1.1.1.1 -> r1.2)
if_fpa.c (r1.1.1.1 -> r1.2)
pdq_freebsd.h (r1.1.1.1 -> r1.2)
pdq_ifsubr.c (r1.1.1.1 -> r1.2)
pdqreg.h (r1.1.1.1 -> r1.2)
pdqvar.h (r1.1.1.1 -> r1.2)
-------------- next part --------------
Index: pdqvar.h
===================================================================
RCS file: /home/cvs/src/sys/dev/pdq/pdqvar.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/dev/pdq/pdqvar.h -L sys/dev/pdq/pdqvar.h -u -r1.1.1.1 -r1.2
--- sys/dev/pdq/pdqvar.h
+++ sys/dev/pdq/pdqvar.h
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Id: pdqvar.h,v 1.21 1997/03/21 21:16:04 thomas Exp
- * $FreeBSD: src/sys/dev/pdq/pdqvar.h,v 1.12 2005/06/10 16:49:13 brooks Exp $
+ * $FreeBSD: src/sys/dev/pdq/pdqvar.h,v 1.14 2006/05/16 14:36:30 phk Exp $
*
*/
@@ -88,7 +88,6 @@
#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <machine/cpufunc.h>
-#include <machine/clock.h>
#define ifnet_ret_t void
typedef int ioctl_cmd_t;
typedef enum { PDQ_BUS_EISA, PDQ_BUS_PCI } pdq_bus_t;
@@ -165,7 +164,7 @@
struct ifmedia sc_ifmedia;
#endif
pdq_t *sc_pdq;
-#if defined(__alpha__) || defined(__i386__)
+#if defined(__i386__)
pdq_bus_ioport_t sc_iobase;
#endif
#if defined(PDQ_IOMAPPED)
Index: pdqreg.h
===================================================================
RCS file: /home/cvs/src/sys/dev/pdq/pdqreg.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/dev/pdq/pdqreg.h -L sys/dev/pdq/pdqreg.h -u -r1.1.1.1 -r1.2
--- sys/dev/pdq/pdqreg.h
+++ sys/dev/pdq/pdqreg.h
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Id: pdqreg.h,v 1.11 1997/03/21 21:16:04 thomas Exp
- * $FreeBSD: src/sys/dev/pdq/pdqreg.h,v 1.4 2002/03/29 11:22:19 mdodd Exp $
+ * $FreeBSD: src/sys/dev/pdq/pdqreg.h,v 1.5 2007/06/08 01:48:23 mjacob Exp $
*
*/
@@ -523,7 +523,7 @@
#define PDQ_DB_BUSPA(pdq, m) \
((pdq)->pdq_pa_descriptor_block + \
- ((u_int8_t *) (m) - (u_int8_t *) (pdq)->pdq_dbp))
+ ((volatile u_int8_t *) (m) - (u_int8_t *) (pdq)->pdq_dbp))
typedef enum {
Index: pdq_freebsd.h
===================================================================
RCS file: /home/cvs/src/sys/dev/pdq/pdq_freebsd.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/dev/pdq/pdq_freebsd.h -L sys/dev/pdq/pdq_freebsd.h -u -r1.1.1.1 -r1.2
--- sys/dev/pdq/pdq_freebsd.h
+++ sys/dev/pdq/pdq_freebsd.h
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Id: pdqvar.h,v 1.21 1997/03/21 21:16:04 thomas Exp
- * $FreeBSD: src/sys/dev/pdq/pdq_freebsd.h,v 1.10 2005/06/10 16:49:13 brooks Exp $
+ * $FreeBSD: src/sys/dev/pdq/pdq_freebsd.h,v 1.13 2006/05/16 14:36:30 phk Exp $
*
*/
@@ -62,7 +62,6 @@
#include <vm/vm.h> /* for vtophys */
#include <vm/pmap.h> /* for vtophys */
-#include <machine/clock.h> /* for DELAY */
#endif /* PDQ_HWSUPPORT */
@@ -164,11 +163,7 @@
#define PDQ_OS_CSR_FMT "0x%x"
#define PDQ_OS_USEC_DELAY(n) DELAY(n)
-#ifdef __alpha__
-#define PDQ_OS_VA_TO_BUSPA(pdq, p) alpha_XXX_dmamap((vm_offset_t)p)
-#else
#define PDQ_OS_VA_TO_BUSPA(pdq, p) vtophys(p)
-#endif
#define PDQ_OS_MEMALLOC(n) malloc(n, M_DEVBUF, M_NOWAIT)
#define PDQ_OS_MEMFREE(p, n) free((void *) p, M_DEVBUF)
@@ -260,7 +255,7 @@
* OS dependent functions provided by
* pdq_ifsubr.c or pdq.c to the bus front ends
*/
-void pdq_ifattach (pdq_softc_t *);
+void pdq_ifattach (pdq_softc_t *, const pdq_uint8_t *);
void pdq_ifdetach (pdq_softc_t *);
void pdq_free (device_t);
int pdq_interrupt (pdq_t *pdq);
Index: pdq_ifsubr.c
===================================================================
RCS file: /home/cvs/src/sys/dev/pdq/pdq_ifsubr.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/dev/pdq/pdq_ifsubr.c -L sys/dev/pdq/pdq_ifsubr.c -u -r1.1.1.1 -r1.2
--- sys/dev/pdq/pdq_ifsubr.c
+++ sys/dev/pdq/pdq_ifsubr.c
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pdq/pdq_ifsubr.c,v 1.26.2.2 2005/08/25 05:01:13 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pdq/pdq_ifsubr.c,v 1.30 2007/06/08 01:49:04 mjacob Exp $");
/*
* DEC PDQ FDDI Controller; code for BSD derived operating systems
@@ -242,7 +242,7 @@
struct mbuf *m)
{
pdq_softc_t *sc = pdq->pdq_os_ctx;
-#if NBPFILTER > 0
+#if defined(NBPFILTER) && NBPFILTER > 0
if (PQD_IFNET(sc)->if_bpf != NULL)
PDQ_BPF_MTAP(sc, m);
#endif
@@ -410,7 +410,7 @@
#endif
void
-pdq_ifattach(pdq_softc_t *sc)
+pdq_ifattach(pdq_softc_t *sc, const pdq_uint8_t *llc)
{
struct ifnet *ifp;
@@ -441,7 +441,7 @@
}
#endif
- fddi_ifattach(ifp, FDDI_BPF_SUPPORTED);
+ fddi_ifattach(ifp, llc, FDDI_BPF_SUPPORTED);
}
void
Index: if_fpa.c
===================================================================
RCS file: /home/cvs/src/sys/dev/pdq/if_fpa.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/dev/pdq/if_fpa.c -L sys/dev/pdq/if_fpa.c -u -r1.1.1.1 -r1.2
--- sys/dev/pdq/if_fpa.c
+++ sys/dev/pdq/if_fpa.c
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pdq/if_fpa.c,v 1.25 2005/06/10 16:49:13 brooks Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pdq/if_fpa.c,v 1.27 2007/02/23 19:31:44 imp Exp $");
/*
* DEC PDQ FDDI Controller; code for BSD derived operating systems
@@ -46,7 +46,6 @@
#include <sys/rman.h>
#include <net/if.h>
-#include <net/if_arp.h>
#include <net/if_media.h>
#include <net/fddi.h>
@@ -158,7 +157,7 @@
goto bad;
}
- error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET,
+ error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, NULL,
pdq_pci_ifintr, dev, &sc->irq_ih);
if (error) {
device_printf(dev, "Failed to setup interrupt handler.\n");
@@ -166,9 +165,7 @@
goto bad;
}
- bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes,
- (caddr_t) IFP2ENADDR(sc->ifp), FDDI_ADDR_LEN);
- pdq_ifattach(sc);
+ pdq_ifattach(sc, sc->sc_pdq->pdq_hwaddr.lanaddr_bytes);
return (0);
bad:
Index: if_fea.c
===================================================================
RCS file: /home/cvs/src/sys/dev/pdq/if_fea.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/dev/pdq/if_fea.c -L sys/dev/pdq/if_fea.c -u -r1.1.1.1 -r1.2
--- sys/dev/pdq/if_fea.c
+++ sys/dev/pdq/if_fea.c
@@ -21,7 +21,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.
*
- * $FreeBSD: src/sys/dev/pdq/if_fea.c,v 1.28 2005/06/10 16:49:13 brooks Exp $
+ * $FreeBSD: src/sys/dev/pdq/if_fea.c,v 1.30 2007/02/23 20:11:25 piso Exp $
*/
/*
@@ -43,7 +43,6 @@
#include <sys/rman.h>
#include <net/if.h>
-#include <net/if_arp.h>
#include <net/if_media.h>
#include <net/fddi.h>
@@ -236,16 +235,14 @@
}
error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET,
- pdq_eisa_ifintr, dev, &sc->irq_ih);
+ NULL, pdq_eisa_ifintr, dev, &sc->irq_ih);
if (error) {
device_printf(dev, "Failed to setup interrupt handler.\n");
error = ENXIO;
goto bad;
}
- bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes,
- (caddr_t) IFP2ENADDR(sc->ifp), FDDI_ADDR_LEN);
- pdq_ifattach(sc);
+ pdq_ifattach(sc, sc->sc_pdq->pdq_hwaddr.lanaddr_bytes);
return (0);
bad:
More information about the Midnightbsd-cvs
mailing list