Thu Aug 17 05:32:05 2017 UTC ()
 Print chip name correctly.


(msaitoh)
diff -r1.13 -r1.14 src/sys/dev/isa/wbsio.c
cvs diff -r1.13 -r1.14 src/sys/dev/isa/wbsio.c (expand / switch to unified diff)

--- src/sys/dev/isa/wbsio.c 2017/08/09 04:45:38 1.13
+++ src/sys/dev/isa/wbsio.c 2017/08/17 05:32:04 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: wbsio.c,v 1.13 2017/08/09 04:45:38 msaitoh Exp $ */ 1/* $NetBSD: wbsio.c,v 1.14 2017/08/17 05:32:04 msaitoh Exp $ */
2/* $OpenBSD: wbsio.c,v 1.10 2015/03/14 03:38:47 jsg Exp $ */ 2/* $OpenBSD: wbsio.c,v 1.10 2015/03/14 03:38:47 jsg Exp $ */
3/* 3/*
4 * Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org> 4 * Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org>
5 * 5 *
6 * Permission to use, copy, modify, and distribute this software for any 6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above 7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies. 8 * copyright notice and this permission notice appear in all copies.
9 * 9 *
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
@@ -165,61 +165,61 @@ wbsio_attach(device_t parent, device_t s @@ -165,61 +165,61 @@ wbsio_attach(device_t parent, device_t s
165 /* Enter configuration mode */ 165 /* Enter configuration mode */
166 wbsio_conf_enable(sc->sc_iot, sc->sc_ioh); 166 wbsio_conf_enable(sc->sc_iot, sc->sc_ioh);
167 167
168 /* Read device ID */ 168 /* Read device ID */
169 reg = wbsio_conf_read(sc->sc_iot, sc->sc_ioh, WBSIO_ID); 169 reg = wbsio_conf_read(sc->sc_iot, sc->sc_ioh, WBSIO_ID);
170 switch (reg) { 170 switch (reg) {
171 case WBSIO_ID_W83627HF: 171 case WBSIO_ID_W83627HF:
172 desc = "W83627HF"; 172 desc = "W83627HF";
173 break; 173 break;
174 case WBSIO_ID_W83627DHG: 174 case WBSIO_ID_W83627DHG:
175 desc = "W83627DHG"; 175 desc = "W83627DHG";
176 break; 176 break;
177 case WBSIO_ID_W83627DHGP: 177 case WBSIO_ID_W83627DHGP:
178 printf("W83627DHG-P"); 178 desc = "W83627DHG-P";
179 break; 179 break;
180 case WBSIO_ID_W83627EHF: 180 case WBSIO_ID_W83627EHF:
181 desc = "W83627EHF"; 181 desc = "W83627EHF";
182 break; 182 break;
183 case WBSIO_ID_W83627SF: 183 case WBSIO_ID_W83627SF:
184 desc = "W83627SF"; 184 desc = "W83627SF";
185 break; 185 break;
186 case WBSIO_ID_W83627THF: 186 case WBSIO_ID_W83627THF:
187 desc = "W83627THF"; 187 desc = "W83627THF";
188 break; 188 break;
189 case WBSIO_ID_W83627UHG: 189 case WBSIO_ID_W83627UHG:
190 printf("W83627UHG"); 190 desc = "W83627UHG";
191 break; 191 break;
192 case WBSIO_ID_W83637HF: 192 case WBSIO_ID_W83637HF:
193 desc = "W83637HF"; 193 desc = "W83637HF";
194 break; 194 break;
195 case WBSIO_ID_W83667HG: 195 case WBSIO_ID_W83667HG:
196 desc = "W83667HG"; 196 desc = "W83667HG";
197 break; 197 break;
198 case WBSIO_ID_W83667HGB: 198 case WBSIO_ID_W83667HGB:
199 desc = "W83667HGB"; 199 desc = "W83667HGB";
200 break; 200 break;
201 case WBSIO_ID_W83687THF: 201 case WBSIO_ID_W83687THF:
202 desc = "W83687THF"; 202 desc = "W83687THF";
203 break; 203 break;
204 case WBSIO_ID_W83697HF: 204 case WBSIO_ID_W83697HF:
205 desc = "W83697HF"; 205 desc = "W83697HF";
206 break; 206 break;
207 case WBSIO_ID_W83697UG: 207 case WBSIO_ID_W83697UG:
208 desc = "W83697UG"; 208 desc = "W83697UG";
209 break; 209 break;
210 case WBSIO_ID_NCT5104D: 210 case WBSIO_ID_NCT5104D:
211 vendor = "Nuvoton"; 211 vendor = "Nuvoton";
212 printf("NCT5104D"); 212 desc = "NCT5104D";
213 break; 213 break;
214 case WBSIO_ID_NCT6775F: 214 case WBSIO_ID_NCT6775F:
215 vendor = "Nuvoton"; 215 vendor = "Nuvoton";
216 desc = "NCT6775F"; 216 desc = "NCT6775F";
217 break; 217 break;
218 case WBSIO_ID_NCT6776F: 218 case WBSIO_ID_NCT6776F:
219 vendor = "Nuvoton"; 219 vendor = "Nuvoton";
220 desc = "NCT6776F"; 220 desc = "NCT6776F";
221 break; 221 break;
222 case WBSIO_ID_NCT6779D: 222 case WBSIO_ID_NCT6779D:
223 vendor = "Nuvoton"; 223 vendor = "Nuvoton";
224 desc = "NCT6779D"; 224 desc = "NCT6779D";
225 break; 225 break;