26c26
< * $FreeBSD: head/sys/dev/acpi_support/acpi_sony.c 137745 2004-11-15 20:08:44Z imp $
---
> * $FreeBSD: head/sys/dev/acpi_support/acpi_sony.c 138197 2004-11-29 16:40:30Z imp $
38,40c38,40
< #define ACPI_SNC_GET_BRIGHTNESS "GBRT"
< #define ACPI_SNC_SET_BRIGHTNESS "SBRT"
< #define ACPI_SNC_GET_PID "GPID"
---
> #define ACPI_SONY_GET_BRIGHTNESS "GBRT"
> #define ACPI_SONY_SET_BRIGHTNESS "SBRT"
> #define ACPI_SONY_GET_PID "GPID"
47c47
< struct acpi_snc_softc {
---
> struct acpi_sony_softc {
50c50
< static struct acpi_snc_name_list
---
> static struct acpi_sony_name_list
56c56
< } acpi_snc_oids[] = {
---
> } acpi_sony_oids[] = {
68,71c68,71
< static int acpi_snc_probe(device_t dev);
< static int acpi_snc_attach(device_t dev);
< static int acpi_snc_detach(device_t dev);
< static int sysctl_acpi_snc_gen_handler(SYSCTL_HANDLER_ARGS);
---
> static int acpi_sony_probe(device_t dev);
> static int acpi_sony_attach(device_t dev);
> static int acpi_sony_detach(device_t dev);
> static int sysctl_acpi_sony_gen_handler(SYSCTL_HANDLER_ARGS);
73c73
< static device_method_t acpi_snc_methods[] = {
---
> static device_method_t acpi_sony_methods[] = {
75,77c75,77
< DEVMETHOD(device_probe, acpi_snc_probe),
< DEVMETHOD(device_attach, acpi_snc_attach),
< DEVMETHOD(device_detach, acpi_snc_detach),
---
> DEVMETHOD(device_probe, acpi_sony_probe),
> DEVMETHOD(device_attach, acpi_sony_attach),
> DEVMETHOD(device_detach, acpi_sony_detach),
82,85c82,85
< static driver_t acpi_snc_driver = {
< "acpi_snc",
< acpi_snc_methods,
< sizeof(struct acpi_snc_softc),
---
> static driver_t acpi_sony_driver = {
> "acpi_sony",
> acpi_sony_methods,
> sizeof(struct acpi_sony_softc),
88c88
< static devclass_t acpi_snc_devclass;
---
> static devclass_t acpi_sony_devclass;
90c90
< DRIVER_MODULE(acpi_snc, acpi, acpi_snc_driver, acpi_snc_devclass,
---
> DRIVER_MODULE(acpi_sony, acpi, acpi_sony_driver, acpi_sony_devclass,
92c92
< MODULE_DEPEND(acpi_snc, acpi, 1, 1, 1);
---
> MODULE_DEPEND(acpi_sony, acpi, 1, 1, 1);
96c96
< acpi_snc_probe(device_t dev)
---
> acpi_sony_probe(device_t dev)
98c98
< struct acpi_snc_softc *sc;
---
> struct acpi_sony_softc *sc;
111c111
< acpi_snc_attach(device_t dev)
---
> acpi_sony_attach(device_t dev)
113c113
< struct acpi_snc_softc *sc;
---
> struct acpi_sony_softc *sc;
117c117
< acpi_GetInteger(acpi_get_handle(dev), ACPI_SNC_GET_PID, &sc->pid);
---
> acpi_GetInteger(acpi_get_handle(dev), ACPI_SONY_GET_PID, &sc->pid);
119c119
< for (i = 0 ; acpi_snc_oids[i].nodename != NULL; i++){
---
> for (i = 0 ; acpi_sony_oids[i].nodename != NULL; i++){
122,125c122,125
< i, acpi_snc_oids[i].nodename , CTLTYPE_INT |
< ((acpi_snc_oids[i].setmethod)? CTLFLAG_RW: CTLFLAG_RD),
< dev, i, sysctl_acpi_snc_gen_handler, "I",
< acpi_snc_oids[i].comment);
---
> i, acpi_sony_oids[i].nodename , CTLTYPE_INT |
> ((acpi_sony_oids[i].setmethod)? CTLFLAG_RW: CTLFLAG_RD),
> dev, i, sysctl_acpi_sony_gen_handler, "I",
> acpi_sony_oids[i].comment);
131c131
< acpi_snc_detach(device_t dev)
---
> acpi_sony_detach(device_t dev)
138c138
< acpi_snc_suspend(device_t dev)
---
> acpi_sony_suspend(device_t dev)
140c140
< struct acpi_snc_softc *sc = device_get_softc(dev);
---
> struct acpi_sony_softc *sc = device_get_softc(dev);
145c145
< acpi_snc_resume(device_t dev)
---
> acpi_sony_resume(device_t dev)
152c152
< sysctl_acpi_snc_gen_handler(SYSCTL_HANDLER_ARGS)
---
> sysctl_acpi_sony_gen_handler(SYSCTL_HANDLER_ARGS)
159c159
< acpi_snc_oids[function].getmethod, &val);
---
> acpi_sony_oids[function].getmethod, &val);
161c161
< if (error || !req->newptr || !acpi_snc_oids[function].setmethod)
---
> if (error || !req->newptr || !acpi_sony_oids[function].setmethod)
164c164
< acpi_snc_oids[function].setmethod, val);
---
> acpi_sony_oids[function].setmethod, val);