| acpi_toshiba.c (129882) | acpi_toshiba.c (130447) |
|---|---|
| 1/*- 2 * Copyright (c) 2003 Hiroyuki Aizu <aizu@navi.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 12 unchanged lines hidden (view full) --- 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * 26 */ 27 28#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2003 Hiroyuki Aizu <aizu@navi.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 12 unchanged lines hidden (view full) --- 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * 26 */ 27 28#include <sys/cdefs.h> |
| 29__FBSDID("$FreeBSD: head/sys/dev/acpi_support/acpi_toshiba.c 129882 2004-05-30 20:34:58Z phk $"); | 29__FBSDID("$FreeBSD: head/sys/dev/acpi_support/acpi_toshiba.c 130447 2004-06-14 03:40:56Z njl $"); |
| 30 31#include "opt_acpi.h" 32#include <sys/param.h> 33#include <sys/kernel.h> 34#include <sys/module.h> 35#include <sys/bus.h> 36 37#include "acpi.h" --- 169 unchanged lines hidden (view full) --- 207 * TOS6200 Libretto L Series 208 * Dynabook Satellite 2455 209 * Dynabook SS 3500 210 * TOS6207 Dynabook SS2110 Series 211 */ 212static int 213acpi_toshiba_probe(device_t dev) 214{ | 30 31#include "opt_acpi.h" 32#include <sys/param.h> 33#include <sys/kernel.h> 34#include <sys/module.h> 35#include <sys/bus.h> 36 37#include "acpi.h" --- 169 unchanged lines hidden (view full) --- 207 * TOS6200 Libretto L Series 208 * Dynabook Satellite 2455 209 * Dynabook SS 3500 210 * TOS6207 Dynabook SS2110 Series 211 */ 212static int 213acpi_toshiba_probe(device_t dev) 214{ |
| 215 ACPI_HANDLE h; |
|
| 215 int ret = ENXIO; 216 | 216 int ret = ENXIO; 217 |
| 218 h = acpi_get_handle(dev); |
|
| 217 if (!acpi_disabled("toshiba") && 218 acpi_get_type(dev) == ACPI_TYPE_DEVICE && 219 device_get_unit(dev) == 0 && | 219 if (!acpi_disabled("toshiba") && 220 acpi_get_type(dev) == ACPI_TYPE_DEVICE && 221 device_get_unit(dev) == 0 && |
| 220 (acpi_MatchHid(dev, "TOS6200") || 221 acpi_MatchHid(dev, "TOS6207"))) { | 222 (acpi_MatchHid(h, "TOS6200") || 223 acpi_MatchHid(h, "TOS6207"))) { |
| 222 device_set_desc(dev, "Toshiba HCI Extras"); 223 ret = 0; 224 } 225 226 return (ret); 227} 228 229static int --- 320 unchanged lines hidden --- | 224 device_set_desc(dev, "Toshiba HCI Extras"); 225 ret = 0; 226 } 227 228 return (ret); 229} 230 231static int --- 320 unchanged lines hidden --- |