|
|
@ -22,6 +22,7 @@ |
|
|
|
#include <circle/interrupt.h> |
|
|
|
#include <circle/interrupt.h> |
|
|
|
#include <circle/screen.h> |
|
|
|
#include <circle/screen.h> |
|
|
|
#include <circle/serial.h> |
|
|
|
#include <circle/serial.h> |
|
|
|
|
|
|
|
#include <circle/writebuffer.h> |
|
|
|
#include <circle/timer.h> |
|
|
|
#include <circle/timer.h> |
|
|
|
#include <circle/logger.h> |
|
|
|
#include <circle/logger.h> |
|
|
|
#include <circle/usb/usbhcidevice.h> |
|
|
|
#include <circle/usb/usbhcidevice.h> |
|
|
@ -94,7 +95,8 @@ class CStdlibAppScreen : public CStdlibApp |
|
|
|
public: |
|
|
|
public: |
|
|
|
CStdlibAppScreen(const char *kernel) |
|
|
|
CStdlibAppScreen(const char *kernel) |
|
|
|
: CStdlibApp (kernel), |
|
|
|
: CStdlibApp (kernel), |
|
|
|
mScreen (mOptions.GetWidth (), mOptions.GetHeight ()), |
|
|
|
mScreenUnbuffered (mOptions.GetWidth (), mOptions.GetHeight ()), |
|
|
|
|
|
|
|
mScreen (&mScreenUnbuffered), |
|
|
|
mTimer (&mInterrupt), |
|
|
|
mTimer (&mInterrupt), |
|
|
|
mLogger (mOptions.GetLogLevel (), &mTimer) |
|
|
|
mLogger (mOptions.GetLogLevel (), &mTimer) |
|
|
|
{ |
|
|
|
{ |
|
|
@ -107,7 +109,7 @@ public: |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (!mScreen.Initialize ()) |
|
|
|
if (!mScreenUnbuffered.Initialize ()) |
|
|
|
{ |
|
|
|
{ |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
@ -133,8 +135,9 @@ public: |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected: |
|
|
|
protected: |
|
|
|
CScreenDevice mScreen; |
|
|
|
CScreenDevice mScreenUnbuffered; |
|
|
|
//CSerialDevice mSerial;
|
|
|
|
//CSerialDevice mSerial;
|
|
|
|
|
|
|
|
CWriteBufferDevice mScreen; |
|
|
|
CTimer mTimer; |
|
|
|
CTimer mTimer; |
|
|
|
CLogger mLogger; |
|
|
|
CLogger mLogger; |
|
|
|
}; |
|
|
|
}; |
|
|
@ -161,7 +164,7 @@ public: |
|
|
|
mUSBHCI (&mInterrupt, &mTimer, TRUE), |
|
|
|
mUSBHCI (&mInterrupt, &mTimer, TRUE), |
|
|
|
mEMMC (&mInterrupt, &mTimer, &mActLED), |
|
|
|
mEMMC (&mInterrupt, &mTimer, &mActLED), |
|
|
|
#if !defined(__aarch64__) || !defined(LEAVE_QEMU_ON_HALT) |
|
|
|
#if !defined(__aarch64__) || !defined(LEAVE_QEMU_ON_HALT) |
|
|
|
mConsole (0, TRUE) |
|
|
|
mConsole (&mScreen, TRUE) |
|
|
|
#else |
|
|
|
#else |
|
|
|
mConsole (&mScreen) |
|
|
|
mConsole (&mScreen) |
|
|
|
#endif |
|
|
|
#endif |
|
|
|