Cleanup, moving stuff out of ibm.h and such. Moved more configuration variables into main. Minor changes for multiplatform.

This commit is contained in:
waltje
2017-11-02 02:28:00 -05:00
parent 0565bf76af
commit b40ea14027
92 changed files with 565 additions and 467 deletions

View File

@@ -10,7 +10,7 @@
*
* NOTE: The file will also implement an NE1000 for 8-bit ISA systems.
*
* Version: @(#)net_ne2000.c 1.0.21 2017/10/28
* Version: @(#)net_ne2000.c 1.0.22 2017/11/01
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Peter Grehan, grehan@iprg.nokia.com>
@@ -30,6 +30,7 @@
#include "../86box.h"
#include "../config.h"
#include "../ibm.h"
#include "../machine/machine.h"
#include "../io.h"
#include "../mem.h"
#include "../rom.h"

View File

@@ -8,7 +8,7 @@
*
* Definitions for the network module.
*
* Version: @(#)network.h 1.0.9 2017/10/28
* Version: @(#)network.h 1.0.10 2017/11/01
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*/
@@ -47,6 +47,10 @@ typedef struct {
} netdev_t;
#ifdef __cplusplus
extern "C" {
#endif
/* Global variables. */
extern int nic_do_log; /* config */
extern int network_card; /* config */
@@ -88,5 +92,9 @@ extern char *network_card_get_internal_name(int);
extern int network_card_get_from_internal_name(char *);
extern device_t *network_card_getdevice(int);
#ifdef __cplusplus
}
#endif
#endif /*EMU_NETWORK_H*/