[src/netbsd-1-5]: src/sys/dev/pcmcia Pullup rev. 1.19 (approved by thorpej):

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

details:   https://anonhg.NetBSD.org/src/rev/c02812a7803e
branches:  netbsd-1-5
changeset: 489189:c02812a7803e
user:      jun <jun%NetBSD.org@localhost>
date:      Tue Aug 22 07:27:22 2000 +0000

description:
Pullup rev. 1.19 (approved by thorpej):
apply Kenji Aoyama <aoyama%nk.mcu.or.jp@localhost>'s patch
on port-hpcmips-ja%jp.netbsd.org@localhost Mon, 10 Jul 2000 21:21:47 +0900
FIX:
  Can't read CIS tuple chain:some TDK CF Flash memory card.

diffstat:

 sys/dev/pcmcia/pcmcia_cis.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r d473a2fcdb40 -r c02812a7803e sys/dev/pcmcia/pcmcia_cis.c
--- a/sys/dev/pcmcia/pcmcia_cis.c       Tue Aug 22 07:26:44 2000 +0000
+++ b/sys/dev/pcmcia/pcmcia_cis.c       Tue Aug 22 07:27:22 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcmcia_cis.c,v 1.18 2000/02/21 03:26:41 enami Exp $    */
+/*     $NetBSD: pcmcia_cis.c,v 1.18.4.1 2000/08/22 07:27:22 jun Exp $  */
 
 #define        PCMCIACISDEBUG
 
@@ -778,8 +778,14 @@
                        for (count = 0, start = 0, i = 0;
                            (count < 4) && ((i + 4) < 256); i++) {
                                ch = pcmcia_tuple_read_1(tuple, 2 + i);
-                               if (ch == 0xff)
+                               if (ch == 0xff) {
+                                       if (i > start) {
+                                               state->card->cis1_info_buf[i] = 0;
+                                               state->card->cis1_info[count] =
+                                                   state->card->cis1_info_buf + start;
+                                       }
                                        break;
+                               }
                                state->card->cis1_info_buf[i] = ch;
                                if (ch == 0) {
                                        state->card->cis1_info[count] =