[src/netbsd-1-5]: src/sys/dev/ic Pull up revision 1.6 (requested by thorpej):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/428280878ae9
branches:  netbsd-1-5
changeset: 490839:428280878ae9
user:      he <he%NetBSD.org@localhost>
date:      Sun Mar 11 22:18:50 2001 +0000

description:
Pull up revision 1.6 (requested by thorpej):
  Add additional padding needed by the AIR-PCM342.  Fixes PR#12357.

diffstat:

 sys/dev/ic/anreg.h |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r ed24fef27ee2 -r 428280878ae9 sys/dev/ic/anreg.h
--- a/sys/dev/ic/anreg.h        Sun Mar 11 22:15:46 2001 +0000
+++ b/sys/dev/ic/anreg.h        Sun Mar 11 22:18:50 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: anreg.h,v 1.3.2.2 2000/12/12 21:26:34 he Exp $ */
+/*     $NetBSD: anreg.h,v 1.3.2.3 2001/03/11 22:18:50 he Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *     Bill Paul <wpaul%ctr.columbia.edu@localhost>.  All rights reserved.
@@ -485,9 +485,9 @@
 /*
  * Status (read only). Note: the manual claims this RID is 108 bytes
  * long (0x6A is the last datum, which is 2 bytes long) however when
- * this RID is read from the NIC, it returns a length of 110. To be
- * on the safe side, this structure is padded with an extra 16-bit
- * word. (There is a misprint in the manual which says the macaddr
+ * this RID is read from the NIC, it returns a length of 110 or 112.
+ * To be on the safe side, this structure is padded with 4 extra 16-bit
+ * words. (There is a misprint in the manual which says the macaddr
  * field is 8 bytes long.)
  *
  * Also, the channel_set and current_channel fields appear to be
@@ -527,7 +527,7 @@
        u_int16_t               an_max_noise_prev_sec;  /* 0x7A */
        u_int16_t               an_avg_noise_prev_min;  /* 0x7C */
        u_int16_t               an_max_noise_prev_min;  /* 0x7E */
-       u_int16_t               an_spare[2];
+       u_int16_t               an_spare[4];
 };
 
 #define AN_STATUS_OPMODE_CONFIGURED            0x0001