CVS commit: src/sys/dev/pcmcia

2019-10-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Fri Oct 11 04:25:11 UTC 2019

Modified Files:
src/sys/dev/pcmcia: if_malo_pcmcia.c

Log Message:
Delete unused var (made redundant in previous commit).   Unbreak build.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pcmcia/if_malo_pcmcia.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/dev/pcmcia/if_malo_pcmcia.c
diff -u src/sys/dev/pcmcia/if_malo_pcmcia.c:1.22 src/sys/dev/pcmcia/if_malo_pcmcia.c:1.23
--- src/sys/dev/pcmcia/if_malo_pcmcia.c:1.22	Thu Oct 10 23:37:13 2019
+++ src/sys/dev/pcmcia/if_malo_pcmcia.c	Fri Oct 11 04:25:11 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_malo_pcmcia.c,v 1.22 2019/10/10 23:37:13 bad Exp $	*/
+/*	$NetBSD: if_malo_pcmcia.c,v 1.23 2019/10/11 04:25:11 kre Exp $	*/
 /*  $OpenBSD: if_malo.c,v 1.65 2009/03/29 21:53:53 sthen Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.22 2019/10/10 23:37:13 bad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.23 2019/10/11 04:25:11 kre Exp $");
 
 #ifdef _MODULE
 #include 
@@ -1308,7 +1308,6 @@ cmalo_cmd_rsp_hwspec(struct malo_softc *
 	struct ieee80211com *ic = >sc_ic;
 	struct malo_cmd_header *hdr = (struct malo_cmd_header *)sc->sc_cmd;
 	struct malo_cmd_body_spec *body;
-	int i;
 
 	body = (struct malo_cmd_body_spec *)(hdr + 1);
 



CVS commit: src/sys/dev/pcmcia

2019-10-10 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Fri Oct 11 04:25:11 UTC 2019

Modified Files:
src/sys/dev/pcmcia: if_malo_pcmcia.c

Log Message:
Delete unused var (made redundant in previous commit).   Unbreak build.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pcmcia/if_malo_pcmcia.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/pcmcia

2019-10-10 Thread Christoph Badura
Module Name:src
Committed By:   bad
Date:   Thu Oct 10 23:37:13 UTC 2019

Modified Files:
src/sys/dev/pcmcia: if_malo_pcmcia.c

Log Message:
if we can memcpy to body->macaddr, we can memcpy from it.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pcmcia/if_malo_pcmcia.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/dev/pcmcia/if_malo_pcmcia.c
diff -u src/sys/dev/pcmcia/if_malo_pcmcia.c:1.21 src/sys/dev/pcmcia/if_malo_pcmcia.c:1.22
--- src/sys/dev/pcmcia/if_malo_pcmcia.c:1.21	Tue Mar  5 08:25:02 2019
+++ src/sys/dev/pcmcia/if_malo_pcmcia.c	Thu Oct 10 23:37:13 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_malo_pcmcia.c,v 1.21 2019/03/05 08:25:02 msaitoh Exp $	*/
+/*	$NetBSD: if_malo_pcmcia.c,v 1.22 2019/10/10 23:37:13 bad Exp $	*/
 /*  $OpenBSD: if_malo.c,v 1.65 2009/03/29 21:53:53 sthen Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.21 2019/03/05 08:25:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.22 2019/10/10 23:37:13 bad Exp $");
 
 #ifdef _MODULE
 #include 
@@ -1313,8 +1313,7 @@ cmalo_cmd_rsp_hwspec(struct malo_softc *
 	body = (struct malo_cmd_body_spec *)(hdr + 1);
 
 	/* get our MAC address */
-	for (i = 0; i < ETHER_ADDR_LEN; i++)
-		ic->ic_myaddr[i] = body->macaddr[i];
+	memcpy(ic->ic_myaddr, body->macaddr, ETHER_ADDR_LEN);
 
 	return 0;
 }



CVS commit: src/sys/dev/pcmcia

2019-10-10 Thread Christoph Badura
Module Name:src
Committed By:   bad
Date:   Thu Oct 10 23:37:13 UTC 2019

Modified Files:
src/sys/dev/pcmcia: if_malo_pcmcia.c

Log Message:
if we can memcpy to body->macaddr, we can memcpy from it.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pcmcia/if_malo_pcmcia.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/pcmcia

2019-10-04 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Oct  5 01:35:26 UTC 2019

Modified Files:
src/sys/dev/pcmcia: xirc.c

Log Message:
add missing break.

(this code is fun.  it has switch inside switch, and both switches
have two cases, one with an identifier and one with a magic number.)


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pcmcia/xirc.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/dev/pcmcia/xirc.c
diff -u src/sys/dev/pcmcia/xirc.c:1.35 src/sys/dev/pcmcia/xirc.c:1.36
--- src/sys/dev/pcmcia/xirc.c:1.35	Sat Dec  8 17:46:14 2018
+++ src/sys/dev/pcmcia/xirc.c	Sat Oct  5 01:35:26 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: xirc.c,v 1.35 2018/12/08 17:46:14 thorpej Exp $	*/
+/*	$NetBSD: xirc.c,v 1.36 2019/10/05 01:35:26 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.35 2018/12/08 17:46:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.36 2019/10/05 01:35:26 mrg Exp $");
 
 #include "opt_inet.h"
 
@@ -694,6 +694,7 @@ xi_xirc_lan_nid_ciscallback(struct pcmci
 myla[i] = pcmcia_tuple_read_1(tuple, i + 3);
 			return (1);
 		}
+		break;
 
 	case 0x89:
 		if (pcmcia_tuple_read_1(tuple, 0) != 0x04 ||



CVS commit: src/sys/dev/pcmcia

2019-10-04 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Oct  5 01:35:26 UTC 2019

Modified Files:
src/sys/dev/pcmcia: xirc.c

Log Message:
add missing break.

(this code is fun.  it has switch inside switch, and both switches
have two cases, one with an identifier and one with a magic number.)


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pcmcia/xirc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/pcmcia

2019-08-31 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sun Sep  1 00:36:52 UTC 2019

Modified Files:
src/sys/dev/pcmcia: pcmciareg.h

Log Message:
add PCMCIA_CISTPL_SDIO definition.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pcmcia/pcmciareg.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/dev/pcmcia/pcmciareg.h
diff -u src/sys/dev/pcmcia/pcmciareg.h:1.10 src/sys/dev/pcmcia/pcmciareg.h:1.11
--- src/sys/dev/pcmcia/pcmciareg.h:1.10	Sun Dec 11 12:23:23 2005
+++ src/sys/dev/pcmcia/pcmciareg.h	Sun Sep  1 00:36:52 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcmciareg.h,v 1.10 2005/12/11 12:23:23 christos Exp $	*/
+/*	$NetBSD: pcmciareg.h,v 1.11 2019/09/01 00:36:52 mlelstv Exp $	*/
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
@@ -202,6 +202,7 @@
 
 /* #define	PCMCIA_CISTPL_RESERVED		0x80-0x8F */
 #define	PCMCIA_CISTPL_SPCL			0x90
+#define	PCMCIA_CISTPL_SDIO			0x91
 /* #define	PCMCIA_CISTPL_RESERVED		0x90-0xFE */
 
 /*



CVS commit: src/sys/dev/pcmcia

2019-08-31 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sun Sep  1 00:36:52 UTC 2019

Modified Files:
src/sys/dev/pcmcia: pcmciareg.h

Log Message:
add PCMCIA_CISTPL_SDIO definition.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pcmcia/pcmciareg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



Re: CVS commit: src/sys/dev/pcmcia

2017-01-12 Thread coypu
By the way, this code appears to do bogus things with i_len,
like "clear trailing garbage" except using the wrong (constant)
length. it's possible it doesn't work for SSIDs longer than
NETWORK_NAME due to that, but I don't have one or have the
confidence to fix it blindly.

On Thu, Jan 12, 2017 at 05:11:22PM +, Maya Rashish wrote:
> Module Name:  src
> Committed By: maya
> Date: Thu Jan 12 17:11:22 UTC 2017
> 
> Modified Files:
>   src/sys/dev/pcmcia: if_ray.c
> 
> Log Message:
> Remove dead code. RAY_DEF_NWID is a constant string, its length will never
> be above 32.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.84 -r1.85 src/sys/dev/pcmcia/if_ray.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/dev/pcmcia/if_ray.c
> diff -u src/sys/dev/pcmcia/if_ray.c:1.84 src/sys/dev/pcmcia/if_ray.c:1.85
> --- src/sys/dev/pcmcia/if_ray.c:1.84  Thu Jul  7 06:55:42 2016
> +++ src/sys/dev/pcmcia/if_ray.c   Thu Jan 12 17:11:22 2017
> @@ -1,4 +1,4 @@
> -/*   $NetBSD: if_ray.c,v 1.84 2016/07/07 06:55:42 msaitoh Exp $  */
> +/*   $NetBSD: if_ray.c,v 1.85 2017/01/12 17:11:22 maya Exp $ */
>  
>  /*
>   * Copyright (c) 2000 Christian E. Hopps
> @@ -57,7 +57,7 @@
>   */
>  
>  #include 
> -__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.84 2016/07/07 06:55:42 msaitoh Exp 
> $");
> +__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.85 2017/01/12 17:11:22 maya Exp $");
>  
>  #include "opt_inet.h"
>  
> @@ -553,8 +553,6 @@ ray_attach(device_t parent, device_t sel
>*/
>   memset(>sc_dnwid, 0, sizeof(sc->sc_dnwid));
>   sc->sc_dnwid.i_len = strlen(RAY_DEF_NWID);
> - if (sc->sc_dnwid.i_len > IEEE80211_NWID_LEN)
> - sc->sc_dnwid.i_len = IEEE80211_NWID_LEN;
>   if (sc->sc_dnwid.i_len > 0)
>   memcpy(sc->sc_dnwid.i_nwid, RAY_DEF_NWID, sc->sc_dnwid.i_len);
>   memcpy(>sc_cnwid, >sc_dnwid, sizeof(sc->sc_cnwid));
> 



Re: CVS commit: src/sys/dev/pcmcia

2014-04-21 Thread Joerg Sonnenberger
On Mon, Apr 21, 2014 at 08:24:21PM +, Paul Goyette wrote:
 Module Name:  src
 Committed By: pgoyette
 Date: Mon Apr 21 20:24:21 UTC 2014
 
 Modified Files:
   src/sys/dev/pcmcia: if_malo_pcmcia.c
 
 Log Message:
 Insert { ... } to keep gcc happy when DPRINTF() macro is empty.

This is wrong. DPRINTF should expand to do {} while (0) in !DEBUG case.

Joerg


Re: CVS commit: src/sys/dev/pcmcia

2014-04-21 Thread Paul Goyette

Ah, OK.  I will fix shortly.


On Tue, 22 Apr 2014, Joerg Sonnenberger wrote:


On Mon, Apr 21, 2014 at 08:24:21PM +, Paul Goyette wrote:

Module Name:src
Committed By:   pgoyette
Date:   Mon Apr 21 20:24:21 UTC 2014

Modified Files:
src/sys/dev/pcmcia: if_malo_pcmcia.c

Log Message:
Insert { ... } to keep gcc happy when DPRINTF() macro is empty.


This is wrong. DPRINTF should expand to do {} while (0) in !DEBUG case.

Joerg

!DSPAM:53559bfb212621094619121!




-
| Paul Goyette | PGP Key fingerprint: | E-mail addresses:   |
| Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com|
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
| Kernel Developer |  | pgoyette at netbsd.org  |
-


CVS commit: src/sys/dev/pcmcia

2010-01-01 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Jan  2 01:43:12 UTC 2010

Modified Files:
src/sys/dev/pcmcia: if_ne_pcmcia.c

Log Message:
convert to pmf


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/dev/pcmcia/if_ne_pcmcia.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.