From e5fc0292bc2a0e8153c1ffd306bcd9fe15303669 Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Sun, 9 Mar 2003 14:03:32 +0000
Subject: [PATCH] - fixed the usage of BX_CPP_AttrRegparmN() at the i/o write
 handler.   The floppy access should work again.

---
 bochs/iodev/dma.cc | 6 +++---
 bochs/iodev/dma.h  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bochs/iodev/dma.cc b/bochs/iodev/dma.cc
index fb72aadf3..51c9bdf4e 100644
--- a/bochs/iodev/dma.cc
+++ b/bochs/iodev/dma.cc
@@ -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
diff --git a/bochs/iodev/dma.h b/bochs/iodev/dma.h
index 5452888df..d35672b5a 100644
--- a/bochs/iodev/dma.h
+++ b/bochs/iodev/dma.h
@@ -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);