Move opt_sio.h options to conf/options and activate in isa/sio.c

This commit is contained in:
peter 1999-05-09 13:10:49 +00:00
parent e05bc3b49a
commit cecd2635d9
5 changed files with 12 additions and 13 deletions

View File

@ -1,4 +1,4 @@
# $Id: options,v 1.134 1999/04/19 14:19:49 peter Exp $
# $Id: options,v 1.135 1999/05/05 11:24:15 jb Exp $
#
# On the handling of kernel options
#
@ -335,6 +335,11 @@ METEOR_SYSTEM_DEFAULT opt_meteor.h
METEOR_DEALLOC_PAGES opt_meteor.h
METEOR_DEALLOC_ABOVE opt_meteor.h
# Various mi ISA bus flags
COM_ESP opt_sio.h
COM_MULTIPORT opt_sio.h
EXTRA_SIO opt_sio.h
# Include tweaks for running under the SimOS machine simulator.
SIMOS opt_simos.h

View File

@ -1,4 +1,4 @@
# $Id: options.i386,v 1.111 1999/04/13 19:38:10 peter Exp $
# $Id: options.i386,v 1.112 1999/04/24 21:46:56 peter Exp $
DISABLE_PSE
IDE_DELAY
@ -26,9 +26,6 @@ AUTO_EOI_1 opt_auto_eoi.h
AUTO_EOI_2 opt_auto_eoi.h
BREAK_TO_DEBUGGER opt_comconsole.h
CONSPEED opt_comconsole.h
COM_ESP opt_sio.h
COM_MULTIPORT opt_sio.h
EXTRA_SIO opt_sio.h
I586_PMC_GUPROF opt_i586_guprof.h
WLCACHE opt_wavelan.h
WLDEBUG opt_wavelan.h

View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: sio.c,v 1.236 1999/05/09 10:51:13 phk Exp $
* $Id: sio.c,v 1.237 1999/05/09 13:00:44 phk Exp $
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* from: i386/isa sio.c,v 1.234
*/
@ -39,7 +39,7 @@
#include "opt_compat.h"
#include "opt_ddb.h"
#include "opt_devfs.h"
/* #include "opt_sio.h" */
#include "opt_sio.h"
#include "sio.h"
/* #include "pnp.h" */
#define NPNP 0

View File

@ -1,4 +1,4 @@
# $Id: options.i386,v 1.111 1999/04/13 19:38:10 peter Exp $
# $Id: options.i386,v 1.112 1999/04/24 21:46:56 peter Exp $
DISABLE_PSE
IDE_DELAY
@ -26,9 +26,6 @@ AUTO_EOI_1 opt_auto_eoi.h
AUTO_EOI_2 opt_auto_eoi.h
BREAK_TO_DEBUGGER opt_comconsole.h
CONSPEED opt_comconsole.h
COM_ESP opt_sio.h
COM_MULTIPORT opt_sio.h
EXTRA_SIO opt_sio.h
I586_PMC_GUPROF opt_i586_guprof.h
WLCACHE opt_wavelan.h
WLDEBUG opt_wavelan.h

View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: sio.c,v 1.236 1999/05/09 10:51:13 phk Exp $
* $Id: sio.c,v 1.237 1999/05/09 13:00:44 phk Exp $
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* from: i386/isa sio.c,v 1.234
*/
@ -39,7 +39,7 @@
#include "opt_compat.h"
#include "opt_ddb.h"
#include "opt_devfs.h"
/* #include "opt_sio.h" */
#include "opt_sio.h"
#include "sio.h"
/* #include "pnp.h" */
#define NPNP 0