Deleted Added
full compact
acpi_toshiba.c (128207) acpi_toshiba.c (128223)
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 128207 2004-04-14 00:23:58Z njl $");
29__FBSDID("$FreeBSD: head/sys/dev/acpi_support/acpi_toshiba.c 128223 2004-04-14 03:32:01Z njl $");
30
31#include "opt_acpi.h"
32#include <sys/param.h>
33#include <sys/kernel.h>
34#include <sys/bus.h>
35
36#include "acpi.h"
37#include <dev/acpica/acpivar.h>

--- 294 unchanged lines hidden (view full) ---

332 ACPI_STATUS status;
333
334 if (op == HCI_SET) {
335 if (*video_output < 1 || *video_output > 7)
336 return (EINVAL);
337 if (h == NULL)
338 return (ENXIO);
339 *video_output |= HCI_VIDEO_OUTPUT_FLAG;
30
31#include "opt_acpi.h"
32#include <sys/param.h>
33#include <sys/kernel.h>
34#include <sys/bus.h>
35
36#include "acpi.h"
37#include <dev/acpica/acpivar.h>

--- 294 unchanged lines hidden (view full) ---

332 ACPI_STATUS status;
333
334 if (op == HCI_SET) {
335 if (*video_output < 1 || *video_output > 7)
336 return (EINVAL);
337 if (h == NULL)
338 return (ENXIO);
339 *video_output |= HCI_VIDEO_OUTPUT_FLAG;
340 status = acpi_SetInteger(h, "DSSX", *video_output);
340 status = acpi_SetInteger(h, METHOD_VIDEO, *video_output);
341 if (ACPI_SUCCESS(status))
342 ret = 0;
343 else
344 ret = ENXIO;
345 } else {
346 ret = hci_call(h, op, HCI_REG_VIDEO_OUTPUT, video_output);
347 if (ret == 0)
348 *video_output &= 0xff;

--- 200 unchanged lines hidden ---
341 if (ACPI_SUCCESS(status))
342 ret = 0;
343 else
344 ret = ENXIO;
345 } else {
346 ret = hci_call(h, op, HCI_REG_VIDEO_OUTPUT, video_output);
347 if (ret == 0)
348 *video_output &= 0xff;

--- 200 unchanged lines hidden ---