CVS commit: src/sys/compat/ndis
Module Name:src
Committed By: hannken
Date: Thu Apr 13 09:44:48 UTC 2017
Modified Files:
src/sys/compat/ndis: subr_ndis.c
Log Message:
Switch NdisOpenFile() to mountlist iterator.
XXX: Do we need a function or variable to retrieve the root mount or NULL?
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/compat/ndis/subr_ndis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ndis/subr_ndis.c
diff -u src/sys/compat/ndis/subr_ndis.c:1.28 src/sys/compat/ndis/subr_ndis.c:1.29
--- src/sys/compat/ndis/subr_ndis.c:1.28 Tue Mar 25 16:23:58 2014
+++ src/sys/compat/ndis/subr_ndis.c Thu Apr 13 09:44:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_ndis.c,v 1.28 2014/03/25 16:23:58 christos Exp $ */
+/* $NetBSD: subr_ndis.c,v 1.29 2017/04/13 09:44:48 hannken Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.67.2.7 2005/03/31 21:50:11 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.28 2014/03/25 16:23:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.29 2017/04/13 09:44:48 hannken Exp $");
#endif
/*
@@ -3042,6 +3042,8 @@ NdisOpenFile(ndis_status *status, ndis_h
char *path;
linker_file_t head, lf;
void *kldstart, *kldend;
+ mount_iterator_t *iter;
+ struct mount *mp;
ndis_unicode_to_ascii(filename->us_buf,
filename->us_len, &afilename);
@@ -3094,7 +3096,10 @@ NdisOpenFile(ndis_status *status, ndis_h
return;
}
- if (TAILQ_EMPTY(&mountlist)) {
+ mountlist_iterator_init(&iter);
+ mp = mountlist_iterator_next(iter);
+ mountlist_iterator_destroy(iter);
+ if (mp == NULL) {
ExFreePool(fh);
*status = NDIS_STATUS_FILE_NOT_FOUND;
printf("NDIS: could not find file %s in linker list\n",
CVS commit: src/sys/compat/ndis
Module Name:src
Committed By: christos
Date: Mon Feb 8 16:42:04 UTC 2016
Modified Files:
src/sys/compat/ndis: subr_ntoskrnl.c
Log Message:
PR/50784: David Binderman: Add missing braces, this is not python.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/compat/ndis/subr_ntoskrnl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ndis/subr_ntoskrnl.c
diff -u src/sys/compat/ndis/subr_ntoskrnl.c:1.25 src/sys/compat/ndis/subr_ntoskrnl.c:1.26
--- src/sys/compat/ndis/subr_ntoskrnl.c:1.25 Wed Mar 26 14:11:26 2014
+++ src/sys/compat/ndis/subr_ntoskrnl.c Mon Feb 8 11:42:04 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_ntoskrnl.c,v 1.25 2014/03/26 18:11:26 christos Exp $ */
+/* $NetBSD: subr_ntoskrnl.c,v 1.26 2016/02/08 16:42:04 christos Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.43.2.5 2005/03/31 04:24:36 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ntoskrnl.c,v 1.25 2014/03/26 18:11:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ntoskrnl.c,v 1.26 2016/02/08 16:42:04 christos Exp $");
#endif
#ifdef __FreeBSD__
@@ -433,9 +433,10 @@ IoGetDriverObjectExtension(driver_object
e = drv->dro_driverext->dre_usrext.nle_flink;
while (e != &drv->dro_driverext->dre_usrext) {
ce = (custom_extension *)e;
- if (ce->ce_clid == clid)
+ if (ce->ce_clid == clid) {
printf("found\n");
return((void *)(ce + 1));
+ }
e = e->nle_flink;
}
printf("not found\n");
CVS commit: src/sys/compat/ndis
Module Name:src
Committed By: christos
Date: Wed Mar 26 18:11:26 UTC 2014
Modified Files:
src/sys/compat/ndis: subr_ntoskrnl.c
Log Message:
kill {v,}sprintf
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/compat/ndis/subr_ntoskrnl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ndis/subr_ntoskrnl.c
diff -u src/sys/compat/ndis/subr_ntoskrnl.c:1.24 src/sys/compat/ndis/subr_ntoskrnl.c:1.25
--- src/sys/compat/ndis/subr_ntoskrnl.c:1.24 Tue Mar 25 12:23:58 2014
+++ src/sys/compat/ndis/subr_ntoskrnl.c Wed Mar 26 14:11:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_ntoskrnl.c,v 1.24 2014/03/25 16:23:58 christos Exp $ */
+/* $NetBSD: subr_ntoskrnl.c,v 1.25 2014/03/26 18:11:26 christos Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.43.2.5 2005/03/31 04:24:36 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ntoskrnl.c,v 1.24 2014/03/25 16:23:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ntoskrnl.c,v 1.25 2014/03/26 18:11:26 christos Exp $");
#endif
#ifdef __FreeBSD__
@@ -2693,8 +2693,6 @@ image_patch_table ntoskrnl_functbl[] = {
IMPORT_FUNC(RtlFreeAnsiString),
IMPORT_FUNC(RtlFreeUnicodeString),
IMPORT_FUNC(RtlUnicodeStringToInteger),
- IMPORT_FUNC(sprintf),
- IMPORT_FUNC(vsprintf),
IMPORT_FUNC_MAP(_snprintf, snprintf),
IMPORT_FUNC_MAP(_vsnprintf, vsnprintf),
IMPORT_FUNC(DbgPrint),
CVS commit: src/sys/compat/ndis
Module Name:src
Committed By: christos
Date: Tue Mar 25 16:23:58 UTC 2014
Modified Files:
src/sys/compat/ndis: kern_ndis.c subr_ndis.c subr_ntoskrnl.c
Log Message:
kill sprintf
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/compat/ndis/kern_ndis.c
cvs rdiff -u -r1.27 -r1.28 src/sys/compat/ndis/subr_ndis.c
cvs rdiff -u -r1.23 -r1.24 src/sys/compat/ndis/subr_ntoskrnl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ndis/kern_ndis.c
diff -u src/sys/compat/ndis/kern_ndis.c:1.25 src/sys/compat/ndis/kern_ndis.c:1.26
--- src/sys/compat/ndis/kern_ndis.c:1.25 Sat Mar 22 22:55:26 2014
+++ src/sys/compat/ndis/kern_ndis.c Tue Mar 25 12:23:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ndis.c,v 1.25 2014/03/23 02:55:26 christos Exp $ */
+/* $NetBSD: kern_ndis.c,v 1.26 2014/03/25 16:23:58 christos Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.60.2.5 2005/04/01 17:14:20 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.25 2014/03/23 02:55:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.26 2014/03/25 16:23:58 christos Exp $");
#endif
#include
@@ -920,17 +920,18 @@ ndis_create_sysctls(void *arg)
"NDIS API Version", "0x00050001", CTLFLAG_RD);
/* Bus type (PCI, PCMCIA, etc...) */
- sprintf(buf, "%d", (int)sc->ndis_iftype);
+ snprintf(buf, sizeof(buf), "%d", (int)sc->ndis_iftype);
ndis_add_sysctl(sc, "BusType", "Bus Type", buf, CTLFLAG_RD);
if (sc->ndis_res_io != NULL) {
- sprintf(buf, "0x%lx", rman_get_start(sc->ndis_res_io));
+ snprintf(buf, sizeof(buf), "0x%lx",
+ rman_get_start(sc->ndis_res_io));
ndis_add_sysctl(sc, "IOBaseAddress",
"Base I/O Address", buf, CTLFLAG_RD);
}
if (sc->ndis_irq != NULL) {
- sprintf(buf, "%lu", rman_get_start(sc->ndis_irq));
+ snprintf(buf, sizeof(buf), "%lu", rman_get_start(sc->ndis_irq));
ndis_add_sysctl(sc, "InterruptNumber",
"Interrupt Number", buf, CTLFLAG_RD);
}
@@ -1015,17 +1016,18 @@ ndis_create_sysctls(void *arg)
/*"NDIS API Version"*/ "Version", "0x00050001", CTLFLAG_RD);
/* Bus type (PCI, PCMCIA, etc...) */
- sprintf(buf, "%d", (int)sc->ndis_iftype);
+ snprintf(buf, sizeof(buf), "%d", (int)sc->ndis_iftype);
ndis_add_sysctl(sc, "BusType", "Bus Type", buf, CTLFLAG_RD);
if (sc->ndis_res_io != NULL) {
- sprintf(buf, "0x%lx", (long unsigned int)rman_get_start(sc->ndis_res_io));
+ snprintf(buf, sizeof(buf), "0x%lx",
+ (long unsigned int)rman_get_start(sc->ndis_res_io));
ndis_add_sysctl(sc, "IOBaseAddress",
/*"Base I/O Address"*/ "Base I/O", buf, CTLFLAG_RD);
}
if (sc->ndis_irq != NULL) {
- sprintf(buf, "%lu", (long unsigned int)rman_get_start(sc->ndis_irq));
+ snprintf(buf, sizeof(buf), "%lu", (long unsigned int)rman_get_start(sc->ndis_irq));
ndis_add_sysctl(sc, "InterruptNumber",
"Interrupt Number", buf, CTLFLAG_RD);
}
Index: src/sys/compat/ndis/subr_ndis.c
diff -u src/sys/compat/ndis/subr_ndis.c:1.27 src/sys/compat/ndis/subr_ndis.c:1.28
--- src/sys/compat/ndis/subr_ndis.c:1.27 Sun Mar 23 05:31:15 2014
+++ src/sys/compat/ndis/subr_ndis.c Tue Mar 25 12:23:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_ndis.c,v 1.27 2014/03/23 09:31:15 christos Exp $ */
+/* $NetBSD: subr_ndis.c,v 1.28 2014/03/25 16:23:58 christos Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.67.2.7 2005/03/31 21:50:11 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.27 2014/03/23 09:31:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.28 2014/03/25 16:23:58 christos Exp $");
#endif
/*
@@ -160,7 +160,7 @@ __stdcall static void NdisOpenConfigurat
static ndis_status ndis_encode_parm(ndis_miniport_block *,
struct sysctl_oid *, ndis_parm_type, ndis_config_parm **);
static ndis_status ndis_decode_parm(ndis_miniport_block *,
- ndis_config_parm *, char *);
+ ndis_config_parm *, char *, size_t);
#else /* __NetBSD__ */
static ndis_status ndis_encode_parm(ndis_miniport_block *,
void *, ndis_parm_type, ndis_config_parm **);
@@ -853,7 +853,8 @@ NdisReadConfiguration(ndis_status *statu
#ifdef __FreeBSD__
static ndis_status
-ndis_decode_parm(ndis_miniport_block *block, ndis_config_parm *parm, char *val)
+ndis_decode_parm(ndis_miniport_block *block, ndis_config_parm *parm, char *val,
+size_t len)
{
ndis_unicode_string *ustr;
char *astr = NULL;
@@ -868,10 +869,10 @@ ndis_decode_parm(ndis_miniport_block *bl
free(astr, M_DEVBUF);
break;
case ndis_parm_int:
- sprintf(val, "%d", parm->ncp_parmdata.ncp_intdata);
+ snprintf(val, len, "%d", parm->ncp_parmdata.ncp_intdata);
break;
case ndis_parm_hexint:
- sprintf(val, "%xu", parm->ncp_parmdata.ncp_intdata);
+ snprintf(val, len, "%xu", parm->nc
CVS commit: src/sys/compat/ndis
Module Name:src
Committed By: christos
Date: Sun Mar 23 09:31:15 UTC 2014
Modified Files:
src/sys/compat/ndis: subr_ndis.c subr_ntoskrnl.c
Log Message:
fix unused
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/compat/ndis/subr_ndis.c
cvs rdiff -u -r1.22 -r1.23 src/sys/compat/ndis/subr_ntoskrnl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ndis/subr_ndis.c
diff -u src/sys/compat/ndis/subr_ndis.c:1.26 src/sys/compat/ndis/subr_ndis.c:1.27
--- src/sys/compat/ndis/subr_ndis.c:1.26 Fri Feb 3 18:38:07 2012
+++ src/sys/compat/ndis/subr_ndis.c Sun Mar 23 05:31:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_ndis.c,v 1.26 2012/02/03 23:38:07 christos Exp $ */
+/* $NetBSD: subr_ndis.c,v 1.27 2014/03/23 09:31:15 christos Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.67.2.7 2005/03/31 21:50:11 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.26 2012/02/03 23:38:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.27 2014/03/23 09:31:15 christos Exp $");
#endif
/*
@@ -718,7 +718,6 @@ __stdcall static void
NdisReadConfiguration(ndis_status *status, ndis_config_parm **parm, ndis_handle cfg, ndis_unicode_string *key, ndis_parm_type type)
{
char *keystr = NULL;
- uint16_t *unicode;
ndis_miniport_block *block;
struct ndis_softc *sc;
#ifdef __FreeBSD__
@@ -729,7 +728,6 @@ NdisReadConfiguration(ndis_status *statu
#ifdef __NetBSD__
const struct sysctlnode *pnode = NULL;
struct sysctlnode *ndiscld = NULL;
- int error;
int numcld;
int mib[1];
int i;
@@ -753,7 +751,6 @@ NdisReadConfiguration(ndis_status *statu
ndis_unicode_to_ascii(key->us_buf, key->us_len, &keystr);
*parm = &block->nmb_replyparm;
memset((char *)&block->nmb_replyparm, 0, sizeof(ndis_config_parm));
- unicode = (uint16_t *)&block->nmb_dummybuf;
#ifdef __NetBSD__
if(strlen(keystr) + strlen("ndis_") > MAX_SYSCTL_LEN) {
@@ -796,7 +793,7 @@ NdisReadConfiguration(ndis_status *statu
mib[0] = sc->ndis_sysctl_mib;
sysctl_lock(false);
- error = sysctl_locate(curlwp, &mib[0], 1, &pnode, NULL);
+ sysctl_locate(curlwp, &mib[0], 1, &pnode, NULL);
numcld = pnode->sysctl_csize;
ndiscld = pnode->sysctl_child;
@@ -1043,7 +1040,6 @@ NdisReadPciSlotInformation(
#endif
/* PN(NdisReadPciSlotInformation) */
- device_t dev;
struct ndis_softc *sc;
block = (ndis_miniport_block *)adapter;
@@ -1051,8 +1047,8 @@ NdisReadPciSlotInformation(
if (block == NULL)
return(0);
- dev = (device_t)block->nmb_physdeviceobj->do_devext;
#ifdef __FreeBSD__
+ device_t dev = (device_t)block->nmb_physdeviceobj->do_devext;
sc = device_get_softc(dev);
#else /* __NetBSD__ */
sc = (struct ndis_softc *)block->nmb_physdeviceobj->pdo_sc;
@@ -1106,7 +1102,6 @@ NdisWritePciSlotInformation(
pcireg_t*dest;
#endif
- device_t dev;
/* PN(NdisWritePciSlotInformation) */
@@ -1118,8 +1113,8 @@ NdisWritePciSlotInformation(
if (block == NULL)
return(0);
- dev = block->nmb_physdeviceobj->do_devext;
#ifdef __FreeBSD__
+device_t dev = block->nmb_physdeviceobj->do_devext;
sc = device_get_softc(dev);
#else /* __NetBSD__ */
sc = (struct ndis_softc *)block->nmb_physdeviceobj->pdo_sc;
Index: src/sys/compat/ndis/subr_ntoskrnl.c
diff -u src/sys/compat/ndis/subr_ntoskrnl.c:1.22 src/sys/compat/ndis/subr_ntoskrnl.c:1.23
--- src/sys/compat/ndis/subr_ntoskrnl.c:1.22 Fri Feb 3 18:39:59 2012
+++ src/sys/compat/ndis/subr_ntoskrnl.c Sun Mar 23 05:31:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_ntoskrnl.c,v 1.22 2012/02/03 23:39:59 christos Exp $ */
+/* $NetBSD: subr_ntoskrnl.c,v 1.23 2014/03/23 09:31:15 christos Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.43.2.5 2005/03/31 04:24:36 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ntoskrnl.c,v 1.22 2012/02/03 23:39:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ntoskrnl.c,v 1.23 2014/03/23 09:31:15 christos Exp $");
#endif
#ifdef __FreeBSD__
@@ -1001,9 +1001,9 @@ static void
ntoskrnl_wakeup(void *arg)
{
nt_dispatch_header *obj;
- wait_block *w;
list_entry *e;
#ifdef __FreeBSD__
+ wait_block *w;
struct thread *td;
#endif
@@ -1012,9 +1012,9 @@ ntoskrnl_wakeup(void *arg)
obj->dh_sigstate = TRUE;
e = obj->dh_waitlisthead.nle_flink;
while (e != &obj->dh_waitlisthead) {
- w = (wait_block *)e;
/* TODO: is this correct? */
#ifdef __FreeBSD__
+ w = (wait_block *)e;
td = w->wb_kthread;
ndis_thresume(td->td_proc);
#else
CVS commit: src/sys/compat/ndis
Module Name:src
Committed By: christos
Date: Sun Mar 23 02:55:26 UTC 2014
Modified Files:
src/sys/compat/ndis: kern_ndis.c
Log Message:
remove unused
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/compat/ndis/kern_ndis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ndis/kern_ndis.c
diff -u src/sys/compat/ndis/kern_ndis.c:1.24 src/sys/compat/ndis/kern_ndis.c:1.25
--- src/sys/compat/ndis/kern_ndis.c:1.24 Thu Sep 19 14:50:35 2013
+++ src/sys/compat/ndis/kern_ndis.c Sat Mar 22 22:55:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ndis.c,v 1.24 2013/09/19 18:50:35 christos Exp $ */
+/* $NetBSD: kern_ndis.c,v 1.25 2014/03/23 02:55:26 christos Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.60.2.5 2005/04/01 17:14:20 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.24 2013/09/19 18:50:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.25 2014/03/23 02:55:26 christos Exp $");
#endif
#include
@@ -579,14 +579,11 @@ ndis_unsched(void (*func)(void *), void
{
struct ndis_req *r;
struct ndisqhead *q;
- struct proc *p;
if (t == NDIS_TASKQUEUE) {
q = &ndis_ttodo;
- p = ndis_tproc.np_p;
} else {
q = &ndis_itodo;
- p = ndis_iproc.np_p;
}
mtx_lock_spin(&ndis_thr_mtx);
@@ -1484,7 +1481,6 @@ ndis_set_info(void *arg, ndis_oid oid, v
ndis_handle adapter;
__stdcall ndis_setinfo_handler setfunc;
uint32_t byteswritten = 0, bytesneeded = 0;
- int error;
uint8_t irql = 0; /* XXX: gcc */
/*
@@ -1527,9 +1523,8 @@ ndis_set_info(void *arg, ndis_oid oid, v
if (rval == NDIS_STATUS_PENDING) {
mtx_lock(&ndis_req_mtx);
- error = mtsleep(&sc->ndis_block->nmb_setstat,
-PZERO | PNORELOCK,
-"ndisset", 5 * hz, &ndis_req_mtx);
+ mtsleep(&sc->ndis_block->nmb_setstat, PZERO | PNORELOCK,
+ "ndisset", 5 * hz, &ndis_req_mtx);
rval = sc->ndis_block->nmb_setstat;
}
@@ -1708,16 +1703,10 @@ ndis_reset_nic(void *arg)
ndis_handle adapter;
__stdcall ndis_reset_handler resetfunc;
uint8_t addressing_reset;
- struct ifnet *ifp;
int rval;
uint8_t irql = 0; /* XXX: gcc */
sc = arg;
-#ifdef __FreeBSD__
- ifp = &sc->arpcom.ac_if;
-#else
- ifp = &sc->arpcom.ec_if;
-#endif
adapter = sc->ndis_block->nmb_miniportadapterctx;
resetfunc = sc->ndis_chars->nmc_reset_func;
@@ -1746,14 +1735,8 @@ ndis_halt_nic(void *arg)
struct ndis_softc *sc;
ndis_handle adapter;
__stdcall ndis_halt_handler haltfunc;
- struct ifnet *ifp;
sc = arg;
-#ifdef __FreeBSD__
- ifp = &sc->arpcom.ac_if;
-#else
- ifp = &sc->arpcom.ec_if;
-#endif
NDIS_LOCK(sc);
CVS commit: src/sys/compat/ndis
Module Name:src
Committed By: chs
Date: Sun Sep 23 01:14:41 UTC 2012
Modified Files:
src/sys/compat/ndis: kern_ndis.c
Log Message:
remove a debug printf.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/compat/ndis/kern_ndis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ndis/kern_ndis.c
diff -u src/sys/compat/ndis/kern_ndis.c:1.22 src/sys/compat/ndis/kern_ndis.c:1.23
--- src/sys/compat/ndis/kern_ndis.c:1.22 Sat May 14 12:44:16 2011
+++ src/sys/compat/ndis/kern_ndis.c Sun Sep 23 01:14:40 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ndis.c,v 1.22 2011/05/14 12:44:16 rmind Exp $ */
+/* $NetBSD: kern_ndis.c,v 1.23 2012/09/23 01:14:40 chs Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.60.2.5 2005/04/01 17:14:20 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.22 2011/05/14 12:44:16 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.23 2012/09/23 01:14:40 chs Exp $");
#endif
#include
@@ -410,8 +410,6 @@ ndis_create_kthreads(void)
struct ndis_req *r;
int i, error = 0;
- printf("in ndis_create_kthreads\n");
-
#ifdef __FreeBSD__
mtx_init(&ndis_thr_mtx, "NDIS thread lock", NULL, MTX_SPIN);
#else /* __NetBSD__ */
CVS commit: src/sys/compat/ndis
Module Name:src
Committed By: christos
Date: Fri Feb 3 23:38:08 UTC 2012
Modified Files:
src/sys/compat/ndis: subr_ndis.c
Log Message:
Kill of messy ifdefs, and use an ansi prototype.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/compat/ndis/subr_ndis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ndis/subr_ndis.c
diff -u src/sys/compat/ndis/subr_ndis.c:1.25 src/sys/compat/ndis/subr_ndis.c:1.26
--- src/sys/compat/ndis/subr_ndis.c:1.25 Sun Jul 17 16:54:50 2011
+++ src/sys/compat/ndis/subr_ndis.c Fri Feb 3 18:38:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_ndis.c,v 1.25 2011/07/17 20:54:50 joerg Exp $ */
+/* $NetBSD: subr_ndis.c,v 1.26 2012/02/03 23:38:07 christos Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.67.2.7 2005/03/31 21:50:11 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.25 2011/07/17 20:54:50 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.26 2012/02/03 23:38:07 christos Exp $");
#endif
/*
@@ -617,19 +617,16 @@ NdisOpenConfigurationKeyByIndex(
}
static ndis_status
+ndis_encode_parm(
+ndis_miniport_block *block,
#ifdef __FreeBSD__
-ndis_encode_parm(block, oid, type, parm)
- ndis_miniport_block *block;
-struct sysctl_oid *oid;
- ndis_parm_type type;
- ndis_config_parm **parm;
-#else /* __NetBSD__ */
-ndis_encode_parm(block, data, type, parm)
- ndis_miniport_block *block;
-void*data;
- ndis_parm_type type;
- ndis_config_parm **parm;
-#endif
+struct sysctl_oid *oid,
+#define oiddata oid->iod_arg1
+#else
+void *oiddata,
+#endif
+ndis_parm_type type,
+ndis_config_parm **parm)
{
uint16_t *unicode;
ndis_unicode_string *ustr;
@@ -641,56 +638,31 @@ ndis_encode_parm(block, data, type, parm
switch(type) {
case ndis_parm_string:
-#ifdef __FreeBSD__
- ndis_ascii_to_unicode((char *)oid->oid_arg1, &unicode);
-#else /* __NetBSD__ */
- ndis_ascii_to_unicode((char *)data, &unicode);
-#endif
+ ndis_ascii_to_unicode((char *)oiddata, &unicode);
(*parm)->ncp_type = ndis_parm_string;
ustr = &(*parm)->ncp_parmdata.ncp_stringdata;
-#ifdef __FreeBSD__
- ustr->us_len = strlen((char *)oid->oid_arg1) * 2;
-#else /* __NetBSD__ */
- ustr->us_len = strlen((char *)data) * 2;
-#endif
+ ustr->us_len = strlen((char *)oiddata) * 2;
ustr->us_buf = unicode;
break;
case ndis_parm_int:
-#ifdef __FreeBSD__
- if (strncmp((char *)oid->oid_arg1, "0x", 2) == 0) {
-#else /* __NetBSD__ */
- if (strncmp((char *)data, "0x", 2) == 0) {
-#endif
+ if (strncmp(oiddata, "0x", 2) == 0) {
base = 16;
}
else
base = 10;
(*parm)->ncp_type = ndis_parm_int;
(*parm)->ncp_parmdata.ncp_intdata =
-#ifdef __FreeBSD__
- strtol((char *)oid->oid_arg1, NULL, base);
-#else /* __NetBSD__ */
-/* TODO: NetBSD dosen't seem to have a strtol in sys/lib/libkern I hope strtoul is OK */
- strtoul((char *)data, NULL, base);
-#endif
+ strtoul((char *)oiddata, NULL, base);
break;
case ndis_parm_hexint:
-#ifdef __FreeBSD__
- if (strncmp((char *)oid->oid_arg1, "0x", 2) == 0) {
-#else /* __NetBSD__ */
- if (strncmp((char *)data, "0x", 2) == 0) {
-#endif
+ if (strncmp((char *)oiddata, "0x", 2) == 0) {
base = 16;
}
else
base = 10;
(*parm)->ncp_type = ndis_parm_hexint;
(*parm)->ncp_parmdata.ncp_intdata =
-#ifdef __FreeBSD__
- strtoul((char *)oid->oid_arg1, NULL, base);
-#else /* __NetBSD__ */
- strtoul((char *)data, NULL, base);
-#endif
+ strtoul((char *)oiddata, NULL, base);
break;
default:
return(NDIS_STATUS_FAILURE);
CVS commit: src/sys/compat/ndis
Module Name:src Committed By: tron Date: Sat Jan 22 12:06:51 UTC 2011 Modified Files: src/sys/compat/ndis: nbcompat.h Log Message: Fix build of ndiscvt(8). Not sure what broke it in the first place. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/compat/ndis/nbcompat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/ndis/nbcompat.h diff -u src/sys/compat/ndis/nbcompat.h:1.13 src/sys/compat/ndis/nbcompat.h:1.14 --- src/sys/compat/ndis/nbcompat.h:1.13 Wed Apr 28 19:17:04 2010 +++ src/sys/compat/ndis/nbcompat.h Sat Jan 22 12:06:51 2011 @@ -6,11 +6,7 @@ #include #include #include -#ifdef _KERNEL #include -#else -typedef struct device *device_t; -#endif #define CTLFLAG_RW CTLFLAG_READWRITE
CVS commit: src/sys/compat/ndis
Module Name:src
Committed By: cegger
Date: Mon May 11 21:34:56 UTC 2009
Modified Files:
src/sys/compat/ndis: subr_ndis.c
Log Message:
use device_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/compat/ndis/subr_ndis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ndis/subr_ndis.c
diff -u src/sys/compat/ndis/subr_ndis.c:1.20 src/sys/compat/ndis/subr_ndis.c:1.21
--- src/sys/compat/ndis/subr_ndis.c:1.20 Mon May 11 21:31:29 2009
+++ src/sys/compat/ndis/subr_ndis.c Mon May 11 21:34:55 2009
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.67.2.7 2005/03/31 21:50:11 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.20 2009/05/11 21:31:29 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.21 2009/05/11 21:34:55 cegger Exp $");
#endif
/*
@@ -1211,7 +1211,7 @@
va_start(ap, numerrors);
for (i = 0; i < numerrors; i++)
printf ("%s: argptr: %p\n",
- dev->dv_xname,
+ device_xname(dev),
va_arg(ap, void *));
va_end(ap);
CVS commit: src/sys/compat/ndis
Module Name:src
Committed By: cegger
Date: Mon May 11 21:31:29 UTC 2009
Modified Files:
src/sys/compat/ndis: kern_ndis.c subr_ndis.c
Log Message:
use device_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/compat/ndis/kern_ndis.c
cvs rdiff -u -r1.19 -r1.20 src/sys/compat/ndis/subr_ndis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ndis/kern_ndis.c
diff -u src/sys/compat/ndis/kern_ndis.c:1.20 src/sys/compat/ndis/kern_ndis.c:1.21
--- src/sys/compat/ndis/kern_ndis.c:1.20 Wed May 6 22:38:31 2009
+++ src/sys/compat/ndis/kern_ndis.c Mon May 11 21:31:29 2009
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.60.2.5 2005/04/01 17:14:20 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.20 2009/05/06 22:38:31 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.21 2009/05/11 21:31:29 cegger Exp $");
#endif
#include
@@ -938,7 +938,7 @@
#endif
if (ifp->if_flags & IFF_DEBUG)
printf("%s: status: %x\n",
- sc->ndis_dev->dv_xname, status);
+ device_xname(sc->ndis_dev), status);
return;
}
@@ -963,7 +963,7 @@
#endif
if (ifp->if_flags & IFF_DEBUG)
printf("%s: status complete\n",
- sc->ndis_dev->dv_xname);
+ device_xname(sc->ndis_dev));
return;
}
@@ -1012,7 +1012,7 @@
if (ifp->if_flags & IFF_DEBUG)
printf("%s: reset done...\n",
- sc->ndis_dev->dv_xname);
+ device_xname(sc->ndis_dev));
wakeup(sc);
return;
}
@@ -1145,7 +1145,7 @@
/* Create the sysctl tree. */
sysctl_createv(&sc->sysctllog, 0, NULL, &ndis_node, CTLFLAG_READWRITE, CTLTYPE_NODE,
- sc->ndis_dev->dv_xname, NULL, NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL);
+ device_xname(sc->ndis_dev), NULL, NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL);
/* Store the number of the ndis mib */
sc->ndis_sysctl_mib = ndis_node->sysctl_num;
Index: src/sys/compat/ndis/subr_ndis.c
diff -u src/sys/compat/ndis/subr_ndis.c:1.19 src/sys/compat/ndis/subr_ndis.c:1.20
--- src/sys/compat/ndis/subr_ndis.c:1.19 Wed Mar 18 17:06:48 2009
+++ src/sys/compat/ndis/subr_ndis.c Mon May 11 21:31:29 2009
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.67.2.7 2005/03/31 21:50:11 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.19 2009/03/18 17:06:48 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.20 2009/05/11 21:31:29 cegger Exp $");
#endif
/*
@@ -1204,9 +1204,9 @@
str = ustr;
}
- printf ("%s: NDIS ERROR: %x (%s)\n", dev->dv_xname, code,
+ printf ("%s: NDIS ERROR: %x (%s)\n", device_xname(dev), code,
str == NULL ? "unknown error" : str);
- printf ("%s: NDIS NUMERRORS: %x\n", dev->dv_xname, numerrors);
+ printf ("%s: NDIS NUMERRORS: %x\n", device_xname(dev), numerrors);
va_start(ap, numerrors);
for (i = 0; i < numerrors; i++)
CVS commit: src/sys/compat/ndis
Module Name:src
Committed By: ad
Date: Wed May 6 22:38:31 UTC 2009
Modified Files:
src/sys/compat/ndis: kern_ndis.c
Log Message:
G/C reference to LK_CANRECURSE.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/compat/ndis/kern_ndis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ndis/kern_ndis.c
diff -u src/sys/compat/ndis/kern_ndis.c:1.19 src/sys/compat/ndis/kern_ndis.c:1.20
--- src/sys/compat/ndis/kern_ndis.c:1.19 Wed Mar 18 17:06:48 2009
+++ src/sys/compat/ndis/kern_ndis.c Wed May 6 22:38:31 2009
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.60.2.5 2005/04/01 17:14:20 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.19 2009/03/18 17:06:48 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.20 2009/05/06 22:38:31 ad Exp $");
#endif
#include
@@ -467,7 +467,7 @@
mtx_init(&ndis_thr_mtx, "NDIS thread lock", NULL, MTX_SPIN);
#else /* __NetBSD__ */
simple_lock_init(&ndis_thr_mtx);
- //lockinit(&ndis_thr_mtx, PWAIT, "NDIS thread lock", 0, 0/*LK_CANRECURSE*//*LK_SPIN*/);
+ //lockinit(&ndis_thr_mtx, PWAIT, "NDIS thread lock", 0, 0);
#endif
mtx_init(&ndis_req_mtx, "NDIS request lock", MTX_NDIS_LOCK, MTX_DEF);
