mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- apply ne2k patch from splite@purdue.edu to fix a few problems that

Browse Source 
appeared in the guest OS.  Full description:
  > After much grovelling through the 8390 docs, I think this is the
  > correct answer to the odd-length packet problem I was having with
  > the ne2k driver under Linux.
  >
  > According to the datasheet, the 8390 always accesses its buffer
  > memory in word-size chunks if the WTS bit of the DCR is set.  So
  > it will always send a word to the host bus interface if WTS==1.
  > It's up to the host bus interface to deliver the the number of
  > requested bytes to the host.  So disallowing a byte read when the
  > WTS bit is set is wrong (IMO) as the bus interface may allow it,
  > as the NE2000 appears to.
  >
  > The patch to ne2k.h bumps the receive buffer memory size to 32K.
  > This fixes the "out-of-bounds chipmem read" errors I was getting.
  >
  > Can someone with an NE2K datasheet verify these changes?  They
  > jibe with the Linux ne.c driver, anyway.
This commit is contained in:
Bryce Denney 2001-06-26 07:49:25 +00:00
parent 75c87e2113
commit ac6f23c3cf
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bochs/iodev/ne2k.cc
View File

@ -260,21 +260,25 @@ bx_ne2k_c::asic_read(Bit32u offset, unsigned int io_len)
switch (offset) {
case 0x0: // Data register
//
// The device must have been set up to perform DMA in
// the same size as is being requested (the WTS bit
// in the DCR), a read remote-DMA command must have
// been issued, and the source-address and length
// registers must have been initialised.
// A read remote-DMA command must have been issued,
// and the source-address and length registers must
// have been initialised.
//
if (io_len != (1 + BX_NE2K_THIS s.DCR.wdsize))
BX_PANIC(("dma read, wrong size %d", io_len));
if (BX_NE2K_THIS s.remote_bytes == 0)
BX_PANIC(("ne2K: dma read, byte count 0"));
if (io_len > BX_NE2K_THIS s.remote_bytes)
BX_PANIC(("ne2K: dma read underrun"));
retval = chipmem_read(BX_NE2K_THIS s.remote_dma, io_len);
BX_NE2K_THIS s.remote_dma += io_len;
BX_NE2K_THIS s.remote_bytes -= io_len;
//
// The 8390 bumps the address and decreases the byte count
// by the selected word size after every access, not by
// the amount of data requested by the host (io_len).
//
BX_NE2K_THIS s.remote_dma += (BX_NE2K_THIS s.DCR.wdsize + 1);
// keep s.remote_bytes from underflowing
if (BX_NE2K_THIS s.remote_bytes > 1)
BX_NE2K_THIS s.remote_bytes -= (BX_NE2K_THIS s.DCR.wdsize + 1);
else
BX_NE2K_THIS s.remote_bytes = 0;
break;
case 0xf: // Reset register

2
bochs/iodev/ne2k.h
View File

@ -38,7 +38,7 @@
# define BX_NE2K_THIS this->
#endif
#define BX_NE2K_MEMSIZ (16*1024)
#define BX_NE2K_MEMSIZ (32*1024)
#define BX_NE2K_MEMSTART (16*1024)
#define BX_NE2K_MEMEND (BX_NE2K_MEMSTART + BX_NE2K_MEMSIZ)