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

- moved mouse buffer size definition to iodev.h

Browse Source 
- reduce dependencies (TODO: update Makefile.in)
- removed unused defines from iodev.h
- updated FSF address
This commit is contained in:
Volker Ruppert 2009-01-16 11:53:38 +00:00
parent 3c82e7983c
commit 34d767f938
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bochs/iodev/iodev.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: iodev.h,v 1.105 2009-01-15 17:34:20 vruppert Exp $
// $Id: iodev.h,v 1.106 2009-01-16 11:53:38 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -33,19 +33,13 @@
#include "bochs.h"
/* maximum number of emulated devices allowed. floppy, vga, etc...
you can increase this to anything below 256 since an 8-bit handle
is used for each device */
#define BX_MAX_IO_DEVICES 30
/* the last device in the array is the "default" I/O device */
#define BX_DEFAULT_IO_DEVICE (BX_MAX_IO_DEVICES-1)
/* number of IRQ lines supported. In an ISA PC there are two
PIC chips cascaded together. each has 8 IRQ lines, so there
should be 16 IRQ's total */
#define BX_MAX_IRQS 16
#define BX_NO_IRQ -1
/* size of internal buffer for mouse devices */
#define BX_MOUSE_BUFF_SIZE 48
#if BX_SUPPORT_APIC
class bx_ioapic_c;
@ -612,7 +606,6 @@ BX_CPP_INLINE void DEV_MEM_WRITE_PHYSICAL_BLOCK(bx_phy_address phy_addr, unsigne
#if BX_SUPPORT_APIC
# include "iodev/ioapic.h"
#endif
#include "iodev/keyboard.h"
#endif /* NO_DEVICE_INCLUDES */

5
bochs/iodev/keyboard.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: keyboard.cc,v 1.137 2009-01-13 19:01:19 vruppert Exp $
// $Id: keyboard.cc,v 1.138 2009-01-16 11:53:38 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -54,6 +54,7 @@
#include "iodev.h"
#include <math.h>
#include "keyboard.h"
#include "scancodes.h"
#define LOG_THIS theKeyboard->
@ -124,7 +125,7 @@ void bx_keyb_c::resetinternals(bx_bool powerup)
void bx_keyb_c::init(void)
{
BX_DEBUG(("Init $Id: keyboard.cc,v 1.137 2009-01-13 19:01:19 vruppert Exp $"));
BX_DEBUG(("Init $Id: keyboard.cc,v 1.138 2009-01-16 11:53:38 vruppert Exp $"));
Bit32u i;
DEV_register_irq(1, "8042 Keyboard controller");

5
bochs/iodev/keyboard.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: keyboard.h,v 1.44 2009-01-13 19:01:19 vruppert Exp $
// $Id: keyboard.h,v 1.45 2009-01-16 11:53:38 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -22,13 +22,12 @@
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
#ifndef _PCKEY_H
#define _PCKEY_H
#define BX_KBD_ELEMENTS 16
#define BX_MOUSE_BUFF_SIZE 48
// these keywords should only be used in keyboard.cc
#if BX_USE_KEY_SMF