svn commit: r366546 - in head/sys: conf dev/syscons/apm i386/bios i386/conf

[Warner Losh]

Author: imp
Date: Thu Oct  8 20:56:06 2020
New Revision: 366546
URL: https://svnweb.freebsd.org/changeset/base/366546

Log:
  Remove APM BIOS support
  
  APM BIOS was relevant only to early laptops (approximately P166 or
  P200 and slower). These have not been relevant for a long time, and
  this code has been untested for a long time (as far as I can
  tell). The APM compat code in ACPI and the apm(8) command is not being
  retired. Both of these items are still in use (apm(8) is more
  scriptable than the replacement acpiconf, for the most part). This has
  been commented out of i386 GENERIC since 2002. This code is not
  relevant to any other port.
  
  Discussed on: arch@

Deleted:
  head/sys/dev/syscons/apm/apm_saver.c
  head/sys/i386/bios/apm.c
  head/sys/i386/bios/apm.h
Modified:
  head/sys/conf/files.i386
  head/sys/i386/conf/GENERIC
  head/sys/i386/conf/NOTES

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Thu Oct  8 20:56:00 2020	(r366545)
+++ head/sys/conf/files.i386	Thu Oct  8 20:56:06 2020	(r366546)
@@ -162,7 +162,6 @@ acpi_wakedata.h			optional acpi				\
 	no-obj no-implicit-rule	before-depend				\
 	clean		"acpi_wakedata.h"
 #
-i386/bios/apm.c			optional apm
 i386/bios/smapi.c		optional smapi
 i386/bios/smapi_bios.S		optional smapi
 i386/cloudabi32/cloudabi32_sysvec.c	optional compat_cloudabi32

Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC	Thu Oct  8 20:56:00 2020	(r366545)
+++ head/sys/i386/conf/GENERIC	Thu Oct  8 20:56:06 2020	(r366546)
@@ -198,9 +198,6 @@ device		vt_vga
 
 device		agp			# support several AGP chipsets
 
-# Power management support (see NOTES for more options)
-#device		apm
-
 # PCCARD (PCMCIA) support
 # PCMCIA and cardbus bridge support
 device		cbb			# cardbus (yenta) bridge

Modified: head/sys/i386/conf/NOTES
==============================================================================
--- head/sys/i386/conf/NOTES	Thu Oct  8 20:56:00 2020	(r366545)
+++ head/sys/i386/conf/NOTES	Thu Oct  8 20:56:06 2020	(r366546)
@@ -729,7 +729,6 @@ device 		hyperv		# HyperV drivers
 #
 # Miscellaneous hardware:
 #
-# apm: Laptop Advanced Power Management (experimental)
 # ipmi: Intelligent Platform Management Interface
 # smapi: System Management Application Program Interface driver
 # smbios: DMI/SMBIOS entry point
@@ -739,10 +738,6 @@ device 		hyperv		# HyperV drivers
 # si: Specialix International SI/XIO or SX intelligent serial card driver
 # tpm: Trusted Platform Module
 
-# Notes on APM
-#  The flags takes the following meaning for apm0:
-#    0x0020  Statclock is broken.
-
 # Notes on the Specialix SI/XIO driver:
 #  The host card is memory, not IO mapped.
 #  The Rev 1 host cards use a 64K chunk, on a 32K boundary.
@@ -761,8 +756,6 @@ device 		hyperv		# HyperV drivers
 #  is the only thing truly supported, but apparently a fair percentage
 #  of the Vaio extra features are controlled by this device.
 
-device		apm
-envvar		hint.apm.0.flags="0x20"
 device		ipmi
 device		smapi
 device		smbios