[Midnightbsd-cvs] src: compat/ndis: remove legacy freebsd version support.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jan 18 14:28:02 EST 2009
Log Message:
-----------
remove legacy freebsd version support.
Modified Files:
--------------
src/sys/compat/ndis:
kern_ndis.c (r1.3 -> r1.4)
subr_ndis.c (r1.3 -> r1.4)
subr_ntoskrnl.c (r1.3 -> r1.4)
-------------- next part --------------
Index: subr_ndis.c
===================================================================
RCS file: /home/cvs/src/sys/compat/ndis/subr_ndis.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -L sys/compat/ndis/subr_ndis.c -L sys/compat/ndis/subr_ndis.c -u -r1.3 -r1.4
--- sys/compat/ndis/subr_ndis.c
+++ sys/compat/ndis/subr_ndis.c
@@ -1,4 +1,3 @@
-/* $MidnightBSD$ */
/*-
* Copyright (c) 2003
* Bill Paul <wpaul at windriver.com>. All rights reserved.
@@ -648,11 +647,7 @@
* See if registry key is already in a list of known keys
* included with the driver.
*/
-#if __FreeBSD_version < 502113
- TAILQ_FOREACH(e, &sc->ndis_ctx, link) {
-#else
TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) {
-#endif
oidp = e->entry;
if (strcasecmp(oidp->oid_name, keystr) == 0) {
if (strcmp((char *)oidp->oid_arg1, "UNSET") == 0) {
@@ -757,11 +752,7 @@
/* See if the key already exists. */
-#if __FreeBSD_version < 502113
- TAILQ_FOREACH(e, &sc->ndis_ctx, link) {
-#else
TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) {
-#endif
oidp = e->entry;
if (strcasecmp(oidp->oid_name, keystr) == 0) {
/* Found it, set the value. */
@@ -1361,23 +1352,11 @@
block = (ndis_miniport_block *)adapter;
sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-#ifdef IFP2ENADDR
- if (bcmp(IFP2ENADDR(sc->ifp), empty, ETHER_ADDR_LEN) == 0)
-#elif __FreeBSD_version >= 700000
if (sc->ifp->if_addr == NULL ||
bcmp(IF_LLADDR(sc->ifp), empty, ETHER_ADDR_LEN) == 0)
-#else
- if (bcmp(sc->arpcom.ac_enaddr, empty, ETHER_ADDR_LEN) == 0)
-#endif
*status = NDIS_STATUS_FAILURE;
else {
-#ifdef IFP2ENADDR
- *addr = IFP2ENADDR(sc->ifp);
-#elif __FreeBSD_version >= 700000
*addr = IF_LLADDR(sc->ifp);
-#else
- *addr = sc->arpcom.ac_enaddr;
-#endif
*addrlen = ETHER_ADDR_LEN;
*status = NDIS_STATUS_SUCCESS;
}
Index: kern_ndis.c
===================================================================
RCS file: /home/cvs/src/sys/compat/ndis/kern_ndis.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -L sys/compat/ndis/kern_ndis.c -L sys/compat/ndis/kern_ndis.c -u -r1.3 -r1.4
--- sys/compat/ndis/kern_ndis.c
+++ sys/compat/ndis/kern_ndis.c
@@ -295,15 +295,6 @@
TAILQ_INIT(&sc->ndis_cfglist_head);
-#if __FreeBSD_version < 502113
- /* Create the sysctl tree. */
-
- sc->ndis_tree = SYSCTL_ADD_NODE(&sc->ndis_ctx,
- SYSCTL_STATIC_CHILDREN(_hw), OID_AUTO,
- device_get_nameunit(sc->ndis_dev), CTLFLAG_RD, 0,
- device_get_desc(sc->ndis_dev));
-
-#endif
/* Add the driver-specific registry keys. */
while(1) {
@@ -318,11 +309,7 @@
/* See if we already have a sysctl with this name */
oidp = NULL;
-#if __FreeBSD_version < 502113
- TAILQ_FOREACH(e, &sc->ndis_ctx, link) {
-#else
TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) {
-#endif
oidp = e->entry;
if (strcasecmp(oidp->oid_name, vals->nc_cfgkey) == 0)
break;
@@ -403,18 +390,11 @@
TAILQ_INSERT_TAIL(&sc->ndis_cfglist_head, cfg, link);
cfg->ndis_oid =
-#if __FreeBSD_version < 502113
- SYSCTL_ADD_STRING(&sc->ndis_ctx, SYSCTL_CHILDREN(sc->ndis_tree),
- OID_AUTO, cfg->ndis_cfg.nc_cfgkey, flag,
- cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val),
- cfg->ndis_cfg.nc_cfgdesc);
-#else
SYSCTL_ADD_STRING(device_get_sysctl_ctx(sc->ndis_dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(sc->ndis_dev)),
OID_AUTO, cfg->ndis_cfg.nc_cfgkey, flag,
cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val),
cfg->ndis_cfg.nc_cfgdesc);
-#endif
return(0);
}
@@ -436,11 +416,7 @@
sc = arg;
-#if __FreeBSD_version < 502113
- clist = &sc->ndis_ctx;
-#else
clist = device_get_sysctl_ctx(sc->ndis_dev);
-#endif
while (!TAILQ_EMPTY(&sc->ndis_cfglist_head)) {
cfg = TAILQ_FIRST(&sc->ndis_cfglist_head);
@@ -568,20 +544,12 @@
device_t dev;
struct resource_list *brl;
struct resource_list_entry *brle;
-#if __FreeBSD_version < 600022
- struct resource_list brl_rev;
- struct resource_list_entry *n;
-#endif
int error = 0;
sc = arg;
block = sc->ndis_block;
dev = sc->ndis_dev;
-#if __FreeBSD_version < 600022
- SLIST_INIT(&brl_rev);
-#endif
-
rl = malloc(sizeof(ndis_resource_list) +
(sizeof(cm_partial_resource_desc) * (sc->ndis_rescnt - 1)),
M_DEVBUF, M_NOWAIT|M_ZERO);
@@ -598,37 +566,7 @@
if (brl != NULL) {
-#if __FreeBSD_version < 600022
- /*
- * We have a small problem. Some PCI devices have
- * multiple I/O ranges. Windows orders them starting
- * from lowest numbered BAR to highest. We discover
- * them in that order too, but insert them into a singly
- * linked list head first, which means when time comes
- * to traverse the list, we enumerate them in reverse
- * order. This screws up some drivers which expect the
- * BARs to be in ascending order so that they can choose
- * the "first" one as their register space. Unfortunately,
- * in order to fix this, we have to create our own
- * temporary list with the entries in reverse order.
- */
-
- SLIST_FOREACH(brle, brl, link) {
- n = malloc(sizeof(struct resource_list_entry),
- M_TEMP, M_NOWAIT);
- if (n == NULL) {
- error = ENOMEM;
- goto bad;
- }
- bcopy((char *)brle, (char *)n,
- sizeof(struct resource_list_entry));
- SLIST_INSERT_HEAD(&brl_rev, n, link);
- }
-
- SLIST_FOREACH(brle, &brl_rev, link) {
-#else
STAILQ_FOREACH(brle, brl, link) {
-#endif
switch (brle->type) {
case SYS_RES_IOPORT:
prd->cprd_type = CmResourceTypePort;
@@ -672,16 +610,6 @@
block->nmb_rlist = rl;
-#if __FreeBSD_version < 600022
-bad:
-
- while (!SLIST_EMPTY(&brl_rev)) {
- n = SLIST_FIRST(&brl_rev);
- SLIST_REMOVE_HEAD(&brl_rev, link);
- free (n, M_TEMP);
- }
-#endif
-
return(error);
}
Index: subr_ntoskrnl.c
===================================================================
RCS file: /home/cvs/src/sys/compat/ndis/subr_ntoskrnl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -L sys/compat/ndis/subr_ntoskrnl.c -L sys/compat/ndis/subr_ntoskrnl.c -u -r1.3 -r1.4
--- sys/compat/ndis/subr_ntoskrnl.c
+++ sys/compat/ndis/subr_ntoskrnl.c
@@ -45,9 +45,7 @@
#include <sys/mutex.h>
#include <sys/callout.h>
-#if __FreeBSD_version > 502113
#include <sys/kdb.h>
-#endif
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/condvar.h>
@@ -2703,11 +2701,7 @@
rl = BUS_GET_RESOURCE_LIST(device_get_parent(dev), dev);
if (rl != NULL) {
-#if __FreeBSD_version < 600022
- SLIST_FOREACH(rle, rl, link) {
-#else
STAILQ_FOREACH(rle, rl, link) {
-#endif
r = rle->res;
if (r == NULL)
@@ -2799,9 +2793,6 @@
KeReleaseSpinLock(&kq->kq_lock, irql);
}
-#if __FreeBSD_version < 502113
- mtx_lock(&Giant);
-#endif
kthread_exit(0);
return; /* notreached */
}
@@ -3560,9 +3551,6 @@
ntoskrnl_kth--;
-#if __FreeBSD_version < 502113
- mtx_lock(&Giant);
-#endif
kthread_exit(0);
return(0); /* notreached */
}
@@ -3584,11 +3572,7 @@
DbgBreakPoint(void)
{
-#if __FreeBSD_version < 502113
- Debugger("DbgBreakPoint(): breakpoint");
-#else
kdb_enter("DbgBreakPoint(): breakpoint");
-#endif
}
static void
@@ -3829,14 +3813,9 @@
thread_lock(curthread);
#ifdef NTOSKRNL_MULTIPLE_DPCS
-#if __FreeBSD_version >= 502102
sched_bind(curthread, kq->kq_cpu);
#endif
-#endif
sched_prio(curthread, PRI_MIN_KERN);
-#if __FreeBSD_version < 600000
- curthread->td_base_pri = PRI_MIN_KERN;
-#endif
thread_unlock(curthread);
while (1) {
@@ -3869,9 +3848,6 @@
KeSetEvent(&kq->kq_done, IO_NO_INCREMENT, FALSE);
}
-#if __FreeBSD_version < 502113
- mtx_lock(&Giant);
-#endif
kthread_exit(0);
return; /* notreached */
}
More information about the Midnightbsd-cvs
mailing list