Parent Directory
| 
Revision Log
++ trunk/HISTORY (local)
$Id: HISTORY,v 1.1055 2005/11/25 22:48:36 debug Exp $
20051031 Adding disassembly support for more ARM instructions (clz,
smul* etc), and adding a hack to support "new tiny" pages
for StrongARM.
20051101 Minor documentation updates (NetBSD 2.0.2 -> 2.1, and OpenBSD
3.7 -> 3.8, and lots of testing).
Changing from 1-sector PIO mode 0 transfers to 128-sector PIO
mode 3 (in dev_wdc).
Various minor ARM dyntrans updates (pc-relative loads from
within the same page as the instruction are now treated as
constant "mov").
20051102 Re-enabling instruction combinations (they were accidentally
disabled).
Dyntrans TLB entries are now overwritten using a round-robin
scheme instead of randomly. This increases performance.
Fixing a typo in file.c (thanks to Chuan-Hua Chang for
noticing it).
Experimenting with adding ATAPI support to dev_wdc (to make
emulated *BSD detect cdroms as cdroms, not harddisks).
20051104 Various minor updates.
20051105 Continuing on the ATAPI emulation. Seems to work well enough
for a NetBSD/cats installation, but not OpenBSD/cats.
Various other updates.
20051106 Modifying the -Y command line option to allow scaleup with
certain graphic controllers (only dev_vga so far), not just
scaledown.
Some minor dyntrans cleanups.
20051107 Beginning a cleanup up the PCI subsystem (removing the
read_register hack, etc).
20051108 Continuing the cleanup; splitting up some pci devices into a
normal autodev device and some separate pci glue code.
20051109 Continuing on the PCI bus stuff; all old pci_*.c have been
incorporated into normal devices and/or rewritten as glue code
only, adding a dummy Intel 82371AB PIIX4 for Malta (not really
tested yet).
Minor pckbc fix so that Linux doesn't complain.
Working on the DEC 21143 NIC (ethernet mac rom stuff mostly).
Various other minor fixes.
20051110 Some more ARM dyntrans fine-tuning (e.g. some instruction
combinations (cmps followed by conditional branch within the
same page) and special cases for DPIs with regform when the
shifter isn't used).
20051111 ARM dyntrans updates: O(n)->O(1) for just-mark-as-non-
writable in the generic pc_to_pointers function, and some other
minor hacks.
Merging Cobalt and evbmips (Malta) ISA interrupt handling,
and some minor fixes to allow Linux to accept harddisk irqs.
20051112 Minor device updates (pckbc, dec21143, lpt, ...), most
importantly fixing the ALI M1543/M5229 so that harddisk irqs
work with Linux/CATS.
20051113 Some more generalizations of the PCI subsystem.
Finally took the time to add a hack for SCSI CDROM TOCs; this
enables OpenBSD to use partition 'a' (as needed by the OpenBSD
installer), and Windows NT's installer to get a bit further.
Also fixing dev_wdc to allow Linux to detect ATAPI CDROMs.
Continuing on the DEC 21143.
20051114 Minor ARM dyntrans tweaks; ARM cmps+branch optimization when
comparing with 0, and generalizing the xchg instr. comb.
Adding disassembly of ARM mrrc/mcrr and q{,d}{add,sub}.
20051115 Continuing on various PPC things (BATs, other address trans-
lation things, various loads/stores, BeBox emulation, etc.).
Beginning to work on PPC interrupt/exception support.
20051116 Factoring out some code which initializes legacy ISA devices
from those machines that use them (bus_isa).
Continuing on PPC interrupt/exception support.
20051117 Minor Malta fixes: RTC year offset = 80, disabling a speed hack
which caused NetBSD to detect a too fast cpu, and adding a new
hack to make Linux detect a faster cpu.
Continuing on the Artesyn PM/PPC emulation mode.
Adding an Algor emulation skeleton (P4032 and P5064);
implementing some of the basics.
Continuing on PPC emulation in general; usage of unimplemented
SPRs is now easier to track, continuing on memory/exception
related issues, etc.
20051118 More work on PPC emulation (tgpr0..3, exception handling,
memory stuff, syscalls, etc.).
20051119 Changing the ARM dyntrans code to mostly use cpu->pc, and not
necessarily use arm reg 15. Seems to work.
Various PPC updates; continuing on the PReP emulation mode.
20051120 Adding a workaround/hack to dev_mc146818 to allow NetBSD/prep
to detect the clock.
20051121 More cleanup of the PCI bus (memory and I/O bases, etc).
Continuing on various PPC things (decrementer and timebase,
WDCs on obio (on PReP) use irq 13, not 14/15).
20051122 Continuing on the CPC700 controller (interrupts etc) for PMPPC,
and on PPC stuff in general.
Finally! After some bug fixes to the virtual to physical addr
translation, NetBSD/{prep,pmppc} 2.1 reach userland and are
stable enough to be interacted with.
More PCI updates; reverse-endian device access for PowerPC etc.
20051123 Generalizing the IEEE floating point subsystem (moving it out
from src/cpus/cpu_mips_coproc.c into a new src/float_emul.c).
Input via slave xterms was sometimes not really working; fixing
this for ns16550, and a warning message is now displayed if
multiple non-xterm consoles are active.
Adding some PPC floating point support, etc.
Various interrupt related updates (dev_wdc, _ns16550, _8259,
and the isa32 common code in machine.c).
NetBSD/prep can now be installed! :-) (Well, with some manual
commands necessary before running sysinst.) Updating the
documentation and various other things to reflect this.
20051124 Various minor documentation updates.
Continuing the work on the DEC 21143 NIC.
20051125 LOTS of work on the 21143. Both OpenBSD and NetBSD work fine
with it now, except that OpenBSD sometimes gives a time-out
warning.
Minor documentation updates.
============== RELEASE 0.3.7 ==============
| 1 | dpavlin | 4 | #ifndef NET_H |
| 2 | #define NET_H | ||
| 3 | |||
| 4 | /* | ||
| 5 | * Copyright (C) 2004-2005 Anders Gavare. All rights reserved. | ||
| 6 | * | ||
| 7 | * Redistribution and use in source and binary forms, with or without | ||
| 8 | * modification, are permitted provided that the following conditions are met: | ||
| 9 | * | ||
| 10 | * 1. Redistributions of source code must retain the above copyright | ||
| 11 | * notice, this list of conditions and the following disclaimer. | ||
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer in the | ||
| 14 | * documentation and/or other materials provided with the distribution. | ||
| 15 | * 3. The name of the author may not be used to endorse or promote products | ||
| 16 | * derived from this software without specific prior written permission. | ||
| 17 | * | ||
| 18 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND | ||
| 19 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 20 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 21 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 22 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 23 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 24 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 25 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 26 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 27 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 28 | * SUCH DAMAGE. | ||
| 29 | * | ||
| 30 | * | ||
| 31 | dpavlin | 20 | * $Id: net.h,v 1.13 2005/11/24 12:32:11 debug Exp $ |
| 32 | dpavlin | 4 | * |
| 33 | * Emulated network support. (See net.c for more info.) | ||
| 34 | */ | ||
| 35 | |||
| 36 | #include <netinet/in.h> | ||
| 37 | #include <arpa/inet.h> | ||
| 38 | #include <netdb.h> | ||
| 39 | |||
| 40 | struct emul; | ||
| 41 | struct ethernet_packet_link; | ||
| 42 | dpavlin | 10 | struct remote_net; |
| 43 | dpavlin | 4 | |
| 44 | |||
| 45 | /*****************************************************************************/ | ||
| 46 | |||
| 47 | /* NOTE: udp_connection and tcp_connection are actually for | ||
| 48 | internal use only. */ | ||
| 49 | struct udp_connection { | ||
| 50 | int in_use; | ||
| 51 | int64_t last_used_timestamp; | ||
| 52 | |||
| 53 | /* Inside: */ | ||
| 54 | unsigned char ethernet_address[6]; | ||
| 55 | unsigned char inside_ip_address[4]; | ||
| 56 | int inside_udp_port; | ||
| 57 | |||
| 58 | /* TODO: Fragment support for outgoing packets! */ | ||
| 59 | int fake_ns; | ||
| 60 | |||
| 61 | /* Outside: */ | ||
| 62 | int udp_id; | ||
| 63 | int socket; | ||
| 64 | unsigned char outside_ip_address[4]; | ||
| 65 | int outside_udp_port; | ||
| 66 | }; | ||
| 67 | |||
| 68 | struct tcp_connection { | ||
| 69 | int in_use; | ||
| 70 | int64_t last_used_timestamp; | ||
| 71 | |||
| 72 | /* Inside: */ | ||
| 73 | unsigned char ethernet_address[6]; | ||
| 74 | unsigned char inside_ip_address[4]; | ||
| 75 | int inside_tcp_port; | ||
| 76 | uint32_t inside_timestamp; | ||
| 77 | |||
| 78 | /* TODO: tx and rx buffers? */ | ||
| 79 | unsigned char *incoming_buf; | ||
| 80 | int incoming_buf_rounds; | ||
| 81 | int incoming_buf_len; | ||
| 82 | uint32_t incoming_buf_seqnr; | ||
| 83 | |||
| 84 | uint32_t inside_seqnr; | ||
| 85 | uint32_t inside_acknr; | ||
| 86 | uint32_t outside_seqnr; | ||
| 87 | uint32_t outside_acknr; | ||
| 88 | |||
| 89 | /* Outside: */ | ||
| 90 | int state; | ||
| 91 | int tcp_id; | ||
| 92 | int socket; | ||
| 93 | unsigned char outside_ip_address[4]; | ||
| 94 | int outside_tcp_port; | ||
| 95 | uint32_t outside_timestamp; | ||
| 96 | }; | ||
| 97 | |||
| 98 | /*****************************************************************************/ | ||
| 99 | |||
| 100 | |||
| 101 | dpavlin | 20 | #define MAX_TCP_CONNECTIONS 100 |
| 102 | #define MAX_UDP_CONNECTIONS 100 | ||
| 103 | dpavlin | 4 | |
| 104 | struct net { | ||
| 105 | /* The emul struct which this net belong to: */ | ||
| 106 | struct emul *emul; | ||
| 107 | |||
| 108 | /* The network's addresses: */ | ||
| 109 | struct in_addr netmask_ipv4; | ||
| 110 | int netmask_ipv4_len; | ||
| 111 | |||
| 112 | /* NICs connected to this network: */ | ||
| 113 | int n_nics; | ||
| 114 | void **nic_extra; /* one void * per NIC */ | ||
| 115 | |||
| 116 | /* The "special machine": */ | ||
| 117 | unsigned char gateway_ipv4_addr[4]; | ||
| 118 | unsigned char gateway_ethernet_addr[6]; | ||
| 119 | |||
| 120 | /* Read from /etc/resolv.conf: */ | ||
| 121 | char *domain_name; | ||
| 122 | int nameserver_known; | ||
| 123 | struct in_addr nameserver_ipv4; | ||
| 124 | |||
| 125 | int64_t timestamp; | ||
| 126 | |||
| 127 | struct ethernet_packet_link *first_ethernet_packet; | ||
| 128 | struct ethernet_packet_link *last_ethernet_packet; | ||
| 129 | |||
| 130 | struct udp_connection udp_connections[MAX_UDP_CONNECTIONS]; | ||
| 131 | struct tcp_connection tcp_connections[MAX_TCP_CONNECTIONS]; | ||
| 132 | dpavlin | 10 | |
| 133 | /* Distributed network: */ | ||
| 134 | int local_port; | ||
| 135 | int local_port_socket; | ||
| 136 | struct remote_net *remote_nets; | ||
| 137 | dpavlin | 4 | }; |
| 138 | |||
| 139 | /* net.c: */ | ||
| 140 | void net_generate_unique_mac(struct machine *, unsigned char *macbuf); | ||
| 141 | int net_ethernet_rx_avail(struct net *net, void *extra); | ||
| 142 | int net_ethernet_rx(struct net *net, void *extra, | ||
| 143 | unsigned char **packetp, int *lenp); | ||
| 144 | void net_ethernet_tx(struct net *net, void *extra, | ||
| 145 | unsigned char *packet, int len); | ||
| 146 | void net_dumpinfo(struct net *net); | ||
| 147 | void net_add_nic(struct net *net, void *extra, unsigned char *macaddr); | ||
| 148 | struct net *net_init(struct emul *emul, int init_flags, | ||
| 149 | dpavlin | 10 | char *ipv4addr, int netipv4len, char **remote, int n_remote, |
| 150 | int local_port); | ||
| 151 | dpavlin | 4 | |
| 152 | /* Flag used to signify that this net should have a gateway: */ | ||
| 153 | #define NET_INIT_FLAG_GATEWAY 1 | ||
| 154 | |||
| 155 | |||
| 156 | /* | ||
| 157 | * This is for internal use in src/net.c: | ||
| 158 | */ | ||
| 159 | struct ethernet_packet_link { | ||
| 160 | struct ethernet_packet_link *prev; | ||
| 161 | struct ethernet_packet_link *next; | ||
| 162 | |||
| 163 | void *extra; | ||
| 164 | unsigned char *data; | ||
| 165 | int len; | ||
| 166 | }; | ||
| 167 | |||
| 168 | dpavlin | 10 | struct remote_net { |
| 169 | struct remote_net *next; | ||
| 170 | dpavlin | 4 | |
| 171 | dpavlin | 10 | char *name; |
| 172 | struct in_addr ipv4_addr; | ||
| 173 | int portnr; | ||
| 174 | }; | ||
| 175 | |||
| 176 | dpavlin | 4 | #define TCP_OUTSIDE_TRYINGTOCONNECT 1 |
| 177 | #define TCP_OUTSIDE_CONNECTED 2 | ||
| 178 | #define TCP_OUTSIDE_DISCONNECTED 3 | ||
| 179 | #define TCP_OUTSIDE_DISCONNECTED2 4 | ||
| 180 | |||
| 181 | #define TCP_INCOMING_BUF_LEN 2000 | ||
| 182 | |||
| 183 | #endif /* NET_H */ |
| ViewVC Help | |
| Powered by ViewVC 1.1.26 |