Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Nov 2023 18:32:40 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 21795c374ace - main - stand: Retire setting hw.eisa_slots.
Message-ID:  <202311241832.3AOIWeFS068221@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=21795c374aceb685dbdb1bd18c7a5c41c3cf0baf

commit 21795c374aceb685dbdb1bd18c7a5c41c3cf0baf
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-11-24 17:58:44 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-11-24 17:58:44 +0000

    stand: Retire setting hw.eisa_slots.
    
    When the eisa code was removed in 2017, prior to the stable/12 branch,
    setting hw.eisa_slots became a nop. The oldest supported branch doesn't
    have eisa at all. The need to set it manually on boot disappeared
    largely by 2000...
    
    Sponsored by:           Netflix
---
 stand/forth/menu-commands.4th | 2 --
 stand/lua/core.lua            | 2 --
 stand/lua/core.lua.8          | 1 -
 3 files changed, 5 deletions(-)

diff --git a/stand/forth/menu-commands.4th b/stand/forth/menu-commands.4th
index decf3fdf6fa4..8121272114d0 100644
--- a/stand/forth/menu-commands.4th
+++ b/stand/forth/menu-commands.4th
@@ -127,7 +127,6 @@ also menu-namespace also menu-command-helpers
 	s" set hw.ata.ata_dma=0" evaluate
 	s" set hw.ata.atapi_dma=0" evaluate
 	s" set hw.ata.wc=0" evaluate
-	s" set hw.eisa_slots=0" evaluate
 	s" set kern.eventtimer.periodic=1" evaluate
 	s" set kern.geom.part.check_integrity=0" evaluate
 ;
@@ -137,7 +136,6 @@ also menu-namespace also menu-command-helpers
 	s" hw.ata.ata_dma" unsetenv
 	s" hw.ata.atapi_dma" unsetenv
 	s" hw.ata.wc" unsetenv
-	s" hw.eisa_slots" unsetenv
 	s" kern.eventtimer.periodic" unsetenv
 	s" kern.geom.part.check_integrity" unsetenv
 ;
diff --git a/stand/lua/core.lua b/stand/lua/core.lua
index f4a2815769c9..4c121319eb36 100644
--- a/stand/lua/core.lua
+++ b/stand/lua/core.lua
@@ -177,7 +177,6 @@ function core.setSafeMode(safe_mode)
 		loader.setenv("hw.ata.ata_dma", "0")
 		loader.setenv("hw.ata.atapi_dma", "0")
 		loader.setenv("hw.ata.wc", "0")
-		loader.setenv("hw.eisa_slots", "0")
 		loader.setenv("kern.eventtimer.periodic", "1")
 		loader.setenv("kern.geom.part.check_integrity", "0")
 	else
@@ -185,7 +184,6 @@ function core.setSafeMode(safe_mode)
 		loader.unsetenv("hw.ata.ata_dma")
 		loader.unsetenv("hw.ata.atapi_dma")
 		loader.unsetenv("hw.ata.wc")
-		loader.unsetenv("hw.eisa_slots")
 		loader.unsetenv("kern.eventtimer.periodic")
 		loader.unsetenv("kern.geom.part.check_integrity")
 	end
diff --git a/stand/lua/core.lua.8 b/stand/lua/core.lua.8
index 61eab6fe24f6..f0f27ee5ae13 100644
--- a/stand/lua/core.lua.8
+++ b/stand/lua/core.lua.8
@@ -127,7 +127,6 @@ Sets or unsets
 .Ev hw.ata.ata_dma ,
 .Ev hw.ata.atapi_dma ,
 .Ev hw.ata.wc ,
-.Ev hw.eisa_slots ,
 .Ev kern.eventtimer.periodic ,
 and
 .Ev kern.geom.part.check_integrity .



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311241832.3AOIWeFS068221>