claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
b6c393cc9122679643d0623ae0e4fbbcac828f04
86Box/src/network/network.h

105 lines
2.5 KiB
C
Raw Normal View History

Network cleanup, updated pcap_if to have a sniffer, PCAP now works properly. Removed all Slirp warnings.
2017-05-09 22:09:55 -04:00
/*
* 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus.
*
* This file is part of the 86Box distribution.
*
* Definitions for the network module.
*
Numerous CD-ROM fixes (and disc changes now work correctly in Windows 98 SE); Slight reworking in the mouse and network code (ported from VARCem) in preparation for a major change that will const a lot of things to further reduce RAM usage.
2018-03-18 20:48:10 +01:00
* Version: @(#)network.h 1.0.13 2018/03/18
Network cleanup, updated pcap_if to have a sniffer, PCAP now works properly. Removed all Slirp warnings.
2017-05-09 22:09:55 -04:00
*
Changes, updates and fixes to fixes. Check the new warnings re timer_add(). Using stricter prototypes receiled more stuff..
2017-06-04 02:11:19 -04:00
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
Network cleanup, updated pcap_if to have a sniffer, PCAP now works properly. Removed all Slirp warnings.
2017-05-09 22:09:55 -04:00
*/
Changes, updates and fixes to fixes. Check the new warnings re timer_add(). Using stricter prototypes receiled more stuff..
2017-06-04 02:11:19 -04:00
#ifndef EMU_NETWORK_H
# define EMU_NETWORK_H
Fixed bugs that were preventing NVR and Flash files from behind saved; A lot of clean ups from waltje; Start of a directory structure for the code, thanks to waltje.
2017-05-06 17:48:33 +02:00
# include <stdint.h>
Cleanup of the configuration code, and source tree layout.
2017-05-18 01:57:16 -04:00
/* Network provider types. */
#define NET_TYPE_NONE 0 /* networking disabled */
#define NET_TYPE_PCAP 1 /* use the (Win)Pcap API */
#define NET_TYPE_SLIRP 2 /* use the SLiRP port forwarder */
/* Supported network cards. */
Finished the NE1000 (per patch from TheCollector1995) and added the RTL8019AS ISA PnP, finalizing the work on NE1000/NE2000-compatible network cards; Disabled excess ZIP logging; Applied the PCem video and SCAT commits; Restored the video initialization line in pc.c back to where it was before.
2018-01-28 03:15:01 +01:00
enum {
NONE = 0,
NE1000,
NE2000,
RTL8019AS,
RTL8029AS
};
Fixed bugs that were preventing NVR and Flash files from behind saved; A lot of clean ups from waltje; Start of a directory structure for the code, thanks to waltje.
2017-05-06 17:48:33 +02:00
Updated network code, major cleanup. SLiRP and Pcap both tested. UI configuration will need extra work by Kotori.
2017-05-12 05:05:20 -04:00
typedef void (*NETRXCB)(void *, uint8_t *, int);
Fixed serial (and serial mouse) operation on boards with Super I/O chips; A few video bug fixes per patches from the mainline PCem forum; Added CUE/BIN image support per patches from the mainline PCem forum.
2017-05-08 04:54:17 +02:00
Fixed bugs that were preventing NVR and Flash files from behind saved; A lot of clean ups from waltje; Start of a directory structure for the code, thanks to waltje.
2017-05-06 17:48:33 +02:00
Updated network code, major cleanup. SLiRP and Pcap both tested. UI configuration will need extra work by Kotori.
2017-05-12 05:05:20 -04:00
typedef struct {
Changed several char arrays all around the code to const char pointers, debloats the executable file from 8.7 MB to 5.6 MB; Replaced the Cirrus Logic code with the latest code from TheCollector1995 - the CL-GD 5428 is now fully working, as is the CL-GD 5429; Minor clean-up in the AHA/BusLogic BIOS commands code; Slightly rewritten mem_readb_phys_dma() and mem_writeb_phys_dma().
2018-02-18 10:32:51 +01:00
const char *name;
const char *internal_name;
Updated network code, major cleanup. SLiRP and Pcap both tested. UI configuration will need extra work by Kotori.
2017-05-12 05:05:20 -04:00
device_t *device;
Minor fixes for C/C++ inter-operation.
2017-10-16 04:54:41 -04:00
void *priv;
Updated network code, major cleanup. SLiRP and Pcap both tested. UI configuration will need extra work by Kotori.
2017-05-12 05:05:20 -04:00
int (*poll)(void *);
NETRXCB rx;
Cleanup, mostly network threading madness. Statusbar is now created at hard reset, IF the configuration has changed. Other minor things.
2017-10-29 04:20:20 -05:00
uint8_t *mac;
Updated network code, major cleanup. SLiRP and Pcap both tested. UI configuration will need extra work by Kotori.
2017-05-12 05:05:20 -04:00
} netcard_t;
typedef struct {
char device[128];
char description[128];
} netdev_t;
Cleanup, moving stuff out of ibm.h and such. Moved more configuration variables into main. Minor changes for multiplatform.
2017-11-02 02:28:00 -05:00
#ifdef __cplusplus
extern "C" {
#endif
Updated network code, major cleanup. SLiRP and Pcap both tested. UI configuration will need extra work by Kotori.
2017-05-12 05:05:20 -04:00
/* Global variables. */
Cleanup, mostly network threading madness. Statusbar is now created at hard reset, IF the configuration has changed. Other minor things.
2017-10-29 04:20:20 -05:00
extern int nic_do_log; /* config */
extern int network_card; /* config */
extern int network_type; /* config */
extern char network_pcap[512]; /* config */
Cleanup of the configuration code, and source tree layout.
2017-05-18 01:57:16 -04:00
extern int network_ndev;
extern netdev_t network_devs[32];
Split off the Network configuration from Other peripherals in the Settings dialog and made PCap device configurable; Overhauled the configuration files so that the global variables are now subdivided into sections; Fixed CD-ROM MODE SENSE page 0x2A which was being incorrectly reported as not implemented, fixes among other things Rayman 1 and Spellcross: The Last Battle (both now see the CD-ROM and play CD Audio fine).
2017-05-17 21:56:31 +02:00
Updated network code, major cleanup. SLiRP and Pcap both tested. UI configuration will need extra work by Kotori.
2017-05-12 05:05:20 -04:00
/* Function prototypes. */
Cleanup, mostly network threading madness. Statusbar is now created at hard reset, IF the configuration has changed. Other minor things.
2017-10-29 04:20:20 -05:00
extern void network_wait(uint8_t wait);
extern void network_poll(void);
Cleaned up the network and SCSI thread stuff.
2017-10-17 05:15:53 +02:00
extern void network_busy(uint8_t set);
Reworked network and SCSI thread initialization and termination; Hard disk controller name and other related strings are now char * instead of fixed-size arrays.
2017-10-19 23:55:51 +02:00
extern void network_end(void);
The SLiRP mutex is now a Network mutex and is now also used by PCap.
2017-10-16 21:19:51 +02:00
Fixed bugs that were preventing NVR and Flash files from behind saved; A lot of clean ups from waltje; Start of a directory structure for the code, thanks to waltje.
2017-05-06 17:48:33 +02:00
extern void network_init(void);
Cleanup, mostly network threading madness. Statusbar is now created at hard reset, IF the configuration has changed. Other minor things.
2017-10-29 04:20:20 -05:00
extern void network_attach(void *, uint8_t *, NETRXCB);
Updated network code, major cleanup. SLiRP and Pcap both tested. UI configuration will need extra work by Kotori.
2017-05-12 05:05:20 -04:00
extern void network_close(void);
Fixed bugs that were preventing NVR and Flash files from behind saved; A lot of clean ups from waltje; Start of a directory structure for the code, thanks to waltje.
2017-05-06 17:48:33 +02:00
extern void network_reset(void);
Cleanup, mostly network threading madness. Statusbar is now created at hard reset, IF the configuration has changed. Other minor things.
2017-10-29 04:20:20 -05:00
extern int network_available(void);
Updated network code, major cleanup. SLiRP and Pcap both tested. UI configuration will need extra work by Kotori.
2017-05-12 05:05:20 -04:00
extern void network_tx(uint8_t *, int);
Cleanup, mostly network threading madness. Statusbar is now created at hard reset, IF the configuration has changed. Other minor things.
2017-10-29 04:20:20 -05:00
extern int net_pcap_prepare(netdev_t *);
extern int net_pcap_init(void);
Numerous CD-ROM fixes (and disc changes now work correctly in Windows 98 SE); Slight reworking in the mouse and network code (ported from VARCem) in preparation for a major change that will const a lot of things to further reduce RAM usage.
2018-03-18 20:48:10 +01:00
extern int net_pcap_reset(netcard_t *, uint8_t *);
Cleanup, mostly network threading madness. Statusbar is now created at hard reset, IF the configuration has changed. Other minor things.
2017-10-29 04:20:20 -05:00
extern void net_pcap_close(void);
extern void net_pcap_in(uint8_t *, int);
extern int net_slirp_init(void);
Numerous CD-ROM fixes (and disc changes now work correctly in Windows 98 SE); Slight reworking in the mouse and network code (ported from VARCem) in preparation for a major change that will const a lot of things to further reduce RAM usage.
2018-03-18 20:48:10 +01:00
extern int net_slirp_reset(netcard_t *, uint8_t *);
Cleanup, mostly network threading madness. Statusbar is now created at hard reset, IF the configuration has changed. Other minor things.
2017-10-29 04:20:20 -05:00
extern void net_slirp_close(void);
extern void net_slirp_in(uint8_t *, int);
Fixed bugs that were preventing NVR and Flash files from behind saved; A lot of clean ups from waltje; Start of a directory structure for the code, thanks to waltje.
2017-05-06 17:48:33 +02:00
Cleanup of the configuration code, and source tree layout.
2017-05-18 01:57:16 -04:00
extern int network_dev_to_id(char *);
Updated network code, major cleanup. SLiRP and Pcap both tested. UI configuration will need extra work by Kotori.
2017-05-12 05:05:20 -04:00
extern int network_card_available(int);
extern char *network_card_getname(int);
extern int network_card_has_config(int);
extern char *network_card_get_internal_name(int);
extern int network_card_get_from_internal_name(char *);
Cleanup of the configuration code, and source tree layout.
2017-05-18 01:57:16 -04:00
extern device_t *network_card_getdevice(int);
Fixed bugs that were preventing NVR and Flash files from behind saved; A lot of clean ups from waltje; Start of a directory structure for the code, thanks to waltje.
2017-05-06 17:48:33 +02:00
Cleanup, moving stuff out of ibm.h and such. Moved more configuration variables into main. Minor changes for multiplatform.
2017-11-02 02:28:00 -05:00
#ifdef __cplusplus
}
#endif
Fixed bugs that were preventing NVR and Flash files from behind saved; A lot of clean ups from waltje; Start of a directory structure for the code, thanks to waltje.
2017-05-06 17:48:33 +02:00
Changes, updates and fixes to fixes. Check the new warnings re timer_add(). Using stricter prototypes receiled more stuff..
2017-06-04 02:11:19 -04:00
#endif /*EMU_NETWORK_H*/
Reference in New Issue Copy Permalink