mirror of https://github.com/stella-emu/stella.git
Some minor code cleanups thanks to R. Broglia. Oh joy, are we actually
getting someone else on board for development :) git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2558 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
parent
7e198cb34d
commit
8d9fcaf774
2
Makefile
2
Makefile
|
@ -51,7 +51,7 @@ else
|
||||||
endif
|
endif
|
||||||
CXXFLAGS+= -Wall
|
CXXFLAGS+= -Wall
|
||||||
ifdef HAVE_GCC
|
ifdef HAVE_GCC
|
||||||
CXXFLAGS+= -Wno-multichar -Wunused -fno-rtti
|
CXXFLAGS+= -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef PROFILE
|
ifdef PROFILE
|
||||||
|
|
|
@ -58,6 +58,8 @@ class AtariVox : public Controller
|
||||||
virtual ~AtariVox();
|
virtual ~AtariVox();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
using Controller::read;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Read the value of the specified digital pin for this controller.
|
Read the value of the specified digital pin for this controller.
|
||||||
|
|
||||||
|
|
|
@ -115,12 +115,12 @@ class Controller : public Serializable
|
||||||
/**
|
/**
|
||||||
Returns the jack that this controller is plugged into.
|
Returns the jack that this controller is plugged into.
|
||||||
*/
|
*/
|
||||||
const Jack jack() const { return myJack; }
|
Jack jack() const { return myJack; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Returns the type of this controller.
|
Returns the type of this controller.
|
||||||
*/
|
*/
|
||||||
const Type type() const { return myType; }
|
Type type() const { return myType; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Read the entire state of all digital pins for this controller.
|
Read the entire state of all digital pins for this controller.
|
||||||
|
|
|
@ -33,9 +33,9 @@
|
||||||
#define JPEE_LOG1(msg,arg1) sprintf(jpee_msg,(msg),(arg1)), jpee_logproc(jpee_msg)
|
#define JPEE_LOG1(msg,arg1) sprintf(jpee_msg,(msg),(arg1)), jpee_logproc(jpee_msg)
|
||||||
#define JPEE_LOG2(msg,arg1,arg2) sprintf(jpee_msg,(msg),(arg1),(arg2)), jpee_logproc(jpee_msg)
|
#define JPEE_LOG2(msg,arg1,arg2) sprintf(jpee_msg,(msg),(arg1),(arg2)), jpee_logproc(jpee_msg)
|
||||||
#else
|
#else
|
||||||
#define JPEE_LOG0(msg)
|
#define JPEE_LOG0(msg) { }
|
||||||
#define JPEE_LOG1(msg,arg1)
|
#define JPEE_LOG1(msg,arg1) { }
|
||||||
#define JPEE_LOG2(msg,arg1,arg2)
|
#define JPEE_LOG2(msg,arg1,arg2) { }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -54,6 +54,8 @@ class SaveKey : public Controller
|
||||||
virtual ~SaveKey();
|
virtual ~SaveKey();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
using Controller::read;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Read the value of the specified digital pin for this controller.
|
Read the value of the specified digital pin for this controller.
|
||||||
|
|
||||||
|
|
|
@ -57,6 +57,8 @@ class TrackBall : public Controller
|
||||||
virtual ~TrackBall();
|
virtual ~TrackBall();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
using Controller::read;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Read the entire state of all digital pins for this controller.
|
Read the entire state of all digital pins for this controller.
|
||||||
Note that this method must use the lower 4 bits, and zero the upper bits.
|
Note that this method must use the lower 4 bits, and zero the upper bits.
|
||||||
|
|
Loading…
Reference in New Issue