[src/trunk]: src/sys/dev/ic Remove an '#ifndef hp300' and make STI_{EN,DIS}AB...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dc6832b30526
branches:  trunk
changeset: 960075:dc6832b30526
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Mar 07 14:31:20 2021 +0000

description:
Remove an '#ifndef hp300' and make STI_{EN,DIS}ABLE_ROM simply check the
sc_{en,disable}_rom methdos provide by the bus attachment glue.

diffstat:

 sys/dev/ic/sti.c |  13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diffs (48 lines):

diff -r 963790dd98be -r dc6832b30526 sys/dev/ic/sti.c
--- a/sys/dev/ic/sti.c  Sun Mar 07 13:09:43 2021 +0000
+++ b/sys/dev/ic/sti.c  Sun Mar 07 14:31:20 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sti.c,v 1.27 2021/03/07 10:02:33 skrll Exp $   */
+/*     $NetBSD: sti.c,v 1.28 2021/03/07 14:31:20 skrll Exp $   */
 
 /*     $OpenBSD: sti.c,v 1.61 2009/09/05 14:09:35 miod Exp $   */
 
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.27 2021/03/07 10:02:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.28 2021/03/07 14:31:20 skrll Exp $");
 
 #include "wsdisplay.h"
 
@@ -54,10 +54,6 @@
 #include <dev/ic/stireg.h>
 #include <dev/ic/stivar.h>
 
-#ifndef hp300  /* XXX */
-#include "sti_pci.h"
-#endif
-
 #ifdef STIDEBUG
 
 #define        DPRINTF(s)      do {    \
@@ -139,7 +135,6 @@
 int    ngle_putcmap(struct sti_screen *, u_int, u_int);
 #endif
 
-#if NSTI_PCI > 0
 #define        STI_ENABLE_ROM(sc) \
 do { \
        if ((sc) != NULL && (sc)->sc_enable_rom != NULL) \
@@ -150,10 +145,6 @@
        if ((sc) != NULL && (sc)->sc_disable_rom != NULL) \
                (*(sc)->sc_disable_rom)(sc); \
 } while (0)
-#else
-#define        STI_ENABLE_ROM(sc)              do { /* nothing */ } while (0)
-#define        STI_DISABLE_ROM(sc)             do { /* nothing */ } while (0)
-#endif
 
 /* Macros to read larger than 8 bit values from byte roms */
 #define        parseshort(o) \