Module Name: src
Committed By: jmcneill
Date: Sun Dec 6 11:38:28 UTC 2020
Modified Files:
src/sys/dev/acpi: acpi_quirks.c acpivar.h
Log Message:
acpi: remove unused acpi_quirks_osi_* functions
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/acpi/acpi_quirks.c
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/acpi/acpivar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_quirks.c
diff -u src/sys/dev/acpi/acpi_quirks.c:1.21 src/sys/dev/acpi/acpi_quirks.c:1.22
--- src/sys/dev/acpi/acpi_quirks.c:1.21 Mon May 4 20:06:38 2020
+++ src/sys/dev/acpi/acpi_quirks.c Sun Dec 6 11:38:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_quirks.c,v 1.21 2020/05/04 20:06:38 jdolecek Exp $ */
+/* $NetBSD: acpi_quirks.c,v 1.22 2020/12/06 11:38:28 jmcneill Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_quirks.c,v 1.21 2020/05/04 20:06:38 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_quirks.c,v 1.22 2020/12/06 11:38:28 jmcneill Exp $");
#include "opt_acpi.h"
@@ -211,61 +211,3 @@ acpi_find_quirks(void)
return 0;
}
-
-/*
- * Add or delete a string to the list that should return
- * true when _OSI is being queried. The defaults are:
- *
- * "Windows 2000" # Windows 2000
- * "Windows 2001" # Windows XP
- * "Windows 2001 SP1" # Windows XP SP1
- * "Windows 2001.1" # Windows Server 2003
- * "Windows 2001 SP2" # Windows XP SP2
- * "Windows 2001.1 SP1" # Windows Server 2003 SP1
- * "Windows 2006" # Windows Vista
- * "Windows 2006.1" # Windows Server 2008
- * "Windows 2006 SP1" # Windows Vista SP1
- * "Windows 2006 SP2" # Windows Vista SP2
- * "Windows 2009" # Windows 7 and Server 2008
- */
-int
-acpi_quirks_osi_add(const char *str)
-{
- ACPI_STATUS rv;
-
- if (str == NULL || *str == '\0')
- return EINVAL;
-
- rv = AcpiInstallInterface(__UNCONST(str));
-
- return (rv != AE_OK) ? EIO : 0;
-}
-
-int
-acpi_quirks_osi_del(const char *str)
-{
- ACPI_STATUS rv;
-
- if (str == NULL || *str == '\0')
- return EINVAL;
-
- rv = AcpiRemoveInterface(__UNCONST(str));
-
- return (rv != AE_OK) ? EIO : 0;
-}
-
-#if 0
-static void
-acpi_quirks_osi_linux(void)
-{
- (void)acpi_quirks_osi_add("Linux");
-}
-
-static void
-acpi_quirks_osi_vista(void)
-{
- (void)acpi_quirks_osi_del("Windows 2006");
- (void)acpi_quirks_osi_del("Windows 2006 SP1");
- (void)acpi_quirks_osi_del("Windows 2006 SP2");
-}
-#endif
Index: src/sys/dev/acpi/acpivar.h
diff -u src/sys/dev/acpi/acpivar.h:1.82 src/sys/dev/acpi/acpivar.h:1.83
--- src/sys/dev/acpi/acpivar.h:1.82 Fri Jan 17 17:06:32 2020
+++ src/sys/dev/acpi/acpivar.h Sun Dec 6 11:38:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpivar.h,v 1.82 2020/01/17 17:06:32 jmcneill Exp $ */
+/* $NetBSD: acpivar.h,v 1.83 2020/12/06 11:38:28 jmcneill Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -382,8 +382,6 @@ struct acpi_quirk {
#define ACPI_QUIRK_OLDBIOS 0x00000010 /* BIOS date blacklisted */
int acpi_find_quirks(void);
-int acpi_quirks_osi_add(const char *);
-int acpi_quirks_osi_del(const char *);
#ifdef ACPI_DEBUG
void acpi_debug_init(void);
