5e520261db
BRANCH_PLUGINS branch! Authors: Bryce Denney Christophe Bothamy Kevin Lawton (we grabbed a lot of plugin code from plex86) Testing help from: Volker Ruppert Don Becker (Psyon) Jeremy Parsons (Br'fin) The change log is too long to paste in here. To read the change log, do cvs log patches/patch.final-from-BRANCH_PLUGINS.gz All the changes and a detailed description are contained in a patch called patch.final-from-BRANCH_PLUGINS.gz. To look at the complete patch, do cvs upd -r1.1 patches/patch.final-from-BRANCH_PLUGINS.gz Then you will have a local copy of the patch, which you can gunzip and play with however you want. Modified Files: .bochsrc Makefile.in aclocal.m4 bochs.h config.h.in configure configure.in gdbstub.cc logio.cc main.cc pc_system.cc pc_system.h state_file.h bios/Makefile.in bios/rombios.c cpu/Makefile.in cpu/access.cc cpu/apic.cc cpu/arith16.cc cpu/arith32.cc cpu/arith8.cc cpu/cpu.cc cpu/cpu.h cpu/ctrl_xfer32.cc cpu/exception.cc cpu/fetchdecode.cc cpu/fetchdecode64.cc cpu/flag_ctrl.cc cpu/flag_ctrl_pro.cc cpu/init.cc cpu/io.cc cpu/logical16.cc cpu/logical32.cc cpu/logical8.cc cpu/paging.cc cpu/proc_ctrl.cc cpu/protect_ctrl.cc cpu/segment_ctrl_pro.cc cpu/shift16.cc cpu/shift32.cc cpu/stack64.cc cpu/string.cc cpu/tasking.cc debug/Makefile.in debug/dbg_main.cc disasm/Makefile.in doc/docbook/user/user.dbk dynamic/Makefile.in fpu/Makefile.in gui/Makefile.in gui/amigaos.cc gui/beos.cc gui/carbon.cc gui/control.cc gui/control.h gui/gui.cc gui/gui.h gui/keymap.cc gui/keymap.h gui/macintosh.cc gui/nogui.cc gui/rfb.cc gui/sdl.cc gui/sdlkeys.h gui/siminterface.cc gui/siminterface.h gui/term.cc gui/win32.cc gui/wx.cc gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc gui/wxmain.h gui/x.cc gui/keymaps/sdl-pc-de.map gui/keymaps/sdl-pc-us.map gui/keymaps/x11-pc-de.map instrument/example0/instrument.h instrument/example1/instrument.h instrument/stubs/instrument.cc instrument/stubs/instrument.h iodev/Makefile.in iodev/biosdev.cc iodev/biosdev.h iodev/cdrom.cc iodev/cmos.cc iodev/cmos.h iodev/devices.cc iodev/dma.cc iodev/dma.h iodev/eth_fbsd.cc iodev/eth_linux.cc iodev/eth_null.cc iodev/eth_tap.cc iodev/floppy.cc iodev/floppy.h iodev/guest2host.cc iodev/guest2host.h iodev/harddrv.cc iodev/harddrv.h iodev/iodebug.cc iodev/iodebug.h iodev/iodev.h iodev/keyboard.cc iodev/keyboard.h iodev/ne2k.cc iodev/ne2k.h iodev/parallel.cc iodev/parallel.h iodev/pci.cc iodev/pci.h iodev/pci2isa.cc iodev/pci2isa.h iodev/pic.cc iodev/pic.h iodev/pit.cc iodev/pit.h iodev/pit_wrap.cc iodev/pit_wrap.h iodev/sb16.cc iodev/sb16.h iodev/scancodes.cc iodev/scancodes.h iodev/serial.cc iodev/serial.h iodev/slowdown_timer.cc iodev/slowdown_timer.h iodev/unmapped.cc iodev/unmapped.h iodev/vga.cc iodev/vga.h memory/Makefile.in memory/memory.cc memory/memory.h memory/misc_mem.cc misc/bximage.c misc/niclist.c Added Files: README-plugins extplugin.h ltdl.c ltdl.h ltdlconf.h.in ltmain.sh plugin.cc plugin.h
161 lines
3.8 KiB
C
161 lines
3.8 KiB
C
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// misc/niclist.c
|
|
// by Don Becker <x-odus@iname.com>
|
|
// $Id: niclist.c,v 1.8 2002-10-24 21:07:56 bdenney Exp $
|
|
//
|
|
// This program is for win32 only. It lists the network interface cards
|
|
// that you can use in the "ethdev" field of the ne2k line in your bochsrc.
|
|
//
|
|
// For this program and for win32 ethernet, the winpcap library is required.
|
|
// Download it from http://netgroup-serv.polito.it/winpcap.
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef WIN32
|
|
#error Niclist will only work on WIN32 platforms.
|
|
#endif
|
|
|
|
#include <windows.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
#define MAX_ADAPTERS 10
|
|
#define NIC_BUFFER_SIZE 2048
|
|
|
|
|
|
// declare our NT/9X structures to hold the adapter name and descriptions
|
|
typedef struct {
|
|
LPWSTR wstrName;
|
|
LPSTR strDesc;
|
|
} NIC_INFO_NT;
|
|
|
|
typedef struct {
|
|
LPSTR strName;
|
|
LPSTR strDesc;
|
|
} NIC_INFO_9X;
|
|
|
|
// declare an array of structures to hold our adapter information
|
|
NIC_INFO_NT niNT[MAX_ADAPTERS];
|
|
NIC_INFO_9X ni9X[MAX_ADAPTERS];
|
|
|
|
BOOLEAN (*PacketGetAdapterNames)(PTSTR, PULONG) = NULL;
|
|
|
|
void myexit (int code)
|
|
{
|
|
printf ("\nPress any key to continue\n");
|
|
getch();
|
|
exit(code);
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
int i;
|
|
HINSTANCE hPacket;
|
|
DWORD dwVersion, dwMajorVersion;
|
|
char AdapterInfo[NIC_BUFFER_SIZE] = { '\0','\0' };
|
|
unsigned long AdapterLength = NIC_BUFFER_SIZE;
|
|
LPWSTR wstrName;
|
|
LPSTR strName, strDesc;
|
|
int nAdapterCount;
|
|
|
|
|
|
// Attemp to load the WinpCap packet library
|
|
hPacket = LoadLibrary("PACKET.DLL");
|
|
if(hPacket)
|
|
{
|
|
// Now look up the address
|
|
PacketGetAdapterNames = (BOOLEAN (*)(PTSTR, PULONG))GetProcAddress(hPacket, "PacketGetAdapterNames");
|
|
}
|
|
else {
|
|
printf("Could not load WinPCap driver!\n");
|
|
printf ("You can download them for free from\n");
|
|
printf ("http://netgroup-serv.polito.it/winpcap\n");
|
|
myexit(1);
|
|
}
|
|
|
|
dwVersion = GetVersion();
|
|
dwMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion)));
|
|
|
|
// Get out blob of adapter info
|
|
PacketGetAdapterNames(AdapterInfo,&AdapterLength);
|
|
|
|
// If this is Windows NT ...
|
|
if(!(dwVersion >= 0x80000000 && dwMajorVersion >= 4))
|
|
{
|
|
wstrName=(LPWSTR)AdapterInfo;
|
|
|
|
// Obtain Names
|
|
nAdapterCount = 0;
|
|
while ((*wstrName))
|
|
{
|
|
// store pointer to name
|
|
niNT[nAdapterCount].wstrName=wstrName;
|
|
wstrName += lstrlenW(wstrName) +1;
|
|
nAdapterCount++;
|
|
}
|
|
|
|
strDesc = (LPSTR)++wstrName;
|
|
|
|
// Obtain descriptions ....
|
|
for(i=0;i<nAdapterCount;i++)
|
|
{
|
|
// store pointer to description
|
|
niNT[i].strDesc=strDesc;
|
|
strDesc += lstrlen(strDesc) +1;
|
|
|
|
// ... and display adapter info
|
|
printf("\n%d: %s\n",i+1,niNT[i].strDesc);
|
|
wprintf(L" Device: %s",niNT[i].wstrName);
|
|
}
|
|
|
|
if(i)
|
|
{
|
|
printf("\n\nExample config for bochsrc:\n");
|
|
wprintf(L"ne2k: ioaddr=0x300, irq=3, mac=b0:c4:20:00:00:00, ethmod=win32, ethdev=%s",niNT[0].wstrName);
|
|
printf("\n");
|
|
}
|
|
|
|
}
|
|
else
|
|
{
|
|
// Windows 9x
|
|
strName=(LPSTR)AdapterInfo;
|
|
|
|
// Obtain Names
|
|
nAdapterCount = 0;
|
|
while ((*strName))
|
|
{
|
|
// store pointer to name
|
|
ni9X[nAdapterCount].strName=strName;
|
|
strName += lstrlen(strName) +1;
|
|
nAdapterCount++;
|
|
}
|
|
|
|
strDesc = (LPSTR)++strName;
|
|
|
|
// Obtain descriptions ....
|
|
for(i=0;i<nAdapterCount;i++)
|
|
{
|
|
// store pointer to description
|
|
ni9X[i].strDesc=strDesc;
|
|
strDesc += lstrlen(strDesc) +1;
|
|
|
|
// ... and display adapter info
|
|
printf("\n%d: %s\n",i+1,ni9X[i].strDesc);
|
|
printf(" Device: %s",ni9X[i].strName);
|
|
}
|
|
|
|
if(i)
|
|
{
|
|
printf("\n\nExample config for bochsrc:\n");
|
|
printf("ne2k: ioaddr=0x300, irq=3, mac=b0:c4:20:00:00:00, ethmod=win32, ethdev=%s",ni9X[0].strName);
|
|
printf("\n");
|
|
}
|
|
|
|
printf("\n");
|
|
}
|
|
|
|
myexit (0);
|
|
}
|