Applied all mainline commits; Moved all declarations to not be in the middle of code; SVGA linear reads and writes now account for linear base; Fixed a bug with the Compaq ATI 28800.

This commit is contained in:
OBattler
2016-08-01 19:14:54 +02:00
parent d50a7e9449
commit 114bbdfc6d
29 changed files with 305 additions and 171 deletions

View File

@@ -129,6 +129,12 @@ void slirp_cleanup(void)
int slirp_init(void)
{
struct in_addr myaddr;
int rc;
char* category = "SLiRP Port Forwarding";
char key[32];
int i = 0, udp, from, to;
#ifdef SLIRP_DEBUG
// debug_init("/tmp/slirp.log", DEBUG_DEFAULT);
// debug_init("slirplog.txt",DEBUG_DEFAULT);
@@ -162,13 +168,8 @@ debug_init("slirplog.txt",DEBUG_DEFAULT);
alias_addr.s_addr = special_addr.s_addr | htonl(CTL_ALIAS);
getouraddr();
struct in_addr myaddr;
int rc;
inet_aton("10.0.2.15",&myaddr);
char* category = "SLiRP Port Forwarding";
char key[32];
int i = 0, udp, from, to;
while (1) {
sprintf(key, "%d_udp", i);
udp = config_get_int(category, key, 0);