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

- fixed the usage of BX_CPP_AttrRegparmN() at the i/o write handler.

Browse Source 
The floppy access should work again.
This commit is contained in:
Volker Ruppert 2003-03-09 14:03:32 +00:00
parent 20091e7f3c
commit e5fc0292bc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/iodev/dma.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: dma.cc,v 1.27 2003-03-02 23:59:10 cbothamy Exp $
// $Id: dma.cc,v 1.28 2003-03-09 14:03:32 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -134,7 +134,7 @@ bx_dma_c::get_TC(void)
bx_dma_c::init(void)
{
unsigned c, i, j;
BX_DEBUG(("Init $Id: dma.cc,v 1.27 2003-03-02 23:59:10 cbothamy Exp $"));
BX_DEBUG(("Init $Id: dma.cc,v 1.28 2003-03-09 14:03:32 vruppert Exp $"));
/* 8237 DMA controller */
@ -343,7 +343,7 @@ bx_dma_c::read( Bit32u address, unsigned io_len)
// static IO port write callback handler
// redirects to non-static class handler to avoid virtual functions
void BX_CPP_AttrRegparmN(3)
void
bx_dma_c::write_handler(void *this_ptr, Bit32u address, Bit32u value, unsigned io_len)
{
#if !BX_USE_DMA_SMF

6
bochs/iodev/dma.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: dma.h,v 1.13 2003-03-02 23:59:10 cbothamy Exp $
// $Id: dma.h,v 1.14 2003-03-09 14:03:32 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -64,10 +64,10 @@ public:
private:
static Bit32u read_handler(void *this_ptr, Bit32u address, unsigned io_len) BX_CPP_AttrRegparmN(3);
static void write_handler(void *this_ptr, Bit32u address, Bit32u value, unsigned io_len) BX_CPP_AttrRegparmN(3);
static void write_handler(void *this_ptr, Bit32u address, Bit32u value, unsigned io_len);
#if !BX_USE_DMA_SMF
Bit32u read( Bit32u address, unsigned io_len) BX_CPP_AttrRegparmN(2);
void write(Bit32u address, Bit32u value, unsigned io_len) BX_CPP_AttrRegparmN(1);
void write(Bit32u address, Bit32u value, unsigned io_len) BX_CPP_AttrRegparmN(3);
#endif
BX_DMA_SMF void control_HRQ(bx_bool ma_sl);
BX_DMA_SMF void reset_controller(unsigned num);