From 45148b3eb7ef9e9de3646196d7e9fa107d9ffaea Mon Sep 17 00:00:00 2001 From: Volker Ruppert Date: Fri, 26 Nov 2010 15:42:41 +0000 Subject: [PATCH] - fixed compiler warning and big endian issue in "send buffer" command code --- bochs/iodev/ne2k.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bochs/iodev/ne2k.cc b/bochs/iodev/ne2k.cc index 41b36e65f..148c7f606 100644 --- a/bochs/iodev/ne2k.cc +++ b/bochs/iodev/ne2k.cc @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: ne2k.cc,v 1.110 2010-11-21 16:21:41 vruppert Exp $ +// $Id: ne2k.cc,v 1.111 2010-11-26 15:42:41 vruppert Exp $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2001-2009 The Bochs Project @@ -292,7 +292,7 @@ void bx_ne2k_c::write_cr(Bit32u value) if (BX_NE2K_THIS s.CR.rdma_cmd == 3) { // Set up DMA read from receive ring BX_NE2K_THIS s.remote_start = BX_NE2K_THIS s.remote_dma = BX_NE2K_THIS s.bound_ptr * 256; - BX_NE2K_THIS s.remote_bytes = *((Bit16u*) & BX_NE2K_THIS s.mem[BX_NE2K_THIS s.bound_ptr * 256 + 2 - BX_NE2K_MEMSTART]); + BX_NE2K_THIS s.remote_bytes = (Bit16u) chipmem_read(BX_NE2K_THIS s.bound_ptr * 256 + 2, 2); BX_INFO(("Sending buffer #x%x length %d", BX_NE2K_THIS s.remote_start, BX_NE2K_THIS s.remote_bytes)); @@ -1410,7 +1410,7 @@ void bx_ne2k_c::init(void) Bit8u macaddr[6]; bx_list_c *base; - BX_DEBUG(("Init $Id: ne2k.cc,v 1.110 2010-11-21 16:21:41 vruppert Exp $")); + BX_DEBUG(("Init $Id: ne2k.cc,v 1.111 2010-11-26 15:42:41 vruppert Exp $")); // Read in values from config interface base = (bx_list_c*) SIM->get_param(BXPN_NE2K);