kopia lustrzana https://github.com/Jean-MarcHarvengt/MCUME
add usb HUB by default
rodzic
77cb348ff8
commit
b3ee7d92b0
|
@ -31,6 +31,7 @@ static const uint16_t * logo = deflogo;
|
|||
#ifdef HAS_USBKEY
|
||||
#include "USBHost_t36.h" // Read this header first for key info
|
||||
USBHost myusb;
|
||||
USBHub hub1(myusb);
|
||||
KeyboardController keyboard1(myusb);
|
||||
#endif
|
||||
static uint8_t usbnavpad=0;
|
||||
|
|
|
@ -31,6 +31,7 @@ static const uint16_t * logo = deflogo;
|
|||
#ifdef HAS_USBKEY
|
||||
#include "USBHost_t36.h" // Read this header first for key info
|
||||
USBHost myusb;
|
||||
USBHub hub1(myusb);
|
||||
KeyboardController keyboard1(myusb);
|
||||
#endif
|
||||
static uint8_t usbnavpad=0;
|
||||
|
|
|
@ -31,6 +31,7 @@ static const uint16_t * logo = deflogo;
|
|||
#ifdef HAS_USBKEY
|
||||
#include "USBHost_t36.h" // Read this header first for key info
|
||||
USBHost myusb;
|
||||
USBHub hub1(myusb);
|
||||
KeyboardController keyboard1(myusb);
|
||||
#endif
|
||||
static uint8_t usbnavpad=0;
|
||||
|
|
|
@ -31,6 +31,7 @@ static const uint16_t * logo = deflogo;
|
|||
#ifdef HAS_USBKEY
|
||||
#include "USBHost_t36.h" // Read this header first for key info
|
||||
USBHost myusb;
|
||||
USBHub hub1(myusb);
|
||||
KeyboardController keyboard1(myusb);
|
||||
#endif
|
||||
static uint8_t usbnavpad=0;
|
||||
|
|
|
@ -34,6 +34,7 @@ static const unsigned short * keysw = keyswzx80;
|
|||
#ifdef HAS_USBKEY
|
||||
#include "USBHost_t36.h" // Read this header first for key info
|
||||
USBHost myusb;
|
||||
USBHub hub1(myusb);
|
||||
KeyboardController keyboard1(myusb);
|
||||
#endif
|
||||
static uint8_t usbnavpad=0;
|
||||
|
|
|
@ -94,7 +94,7 @@ void emu_DrawLine(unsigned char * VBuf, int width, int height, int line)
|
|||
{
|
||||
if (!vgaMode) {
|
||||
#ifdef HAS_T4_VGA
|
||||
tft.writeLine(width,1,line, VBuf, palette8);
|
||||
tft.writeLine(width,height,line, VBuf, palette8);
|
||||
#else
|
||||
tft.writeLine(width,1,line, VBuf, palette16);
|
||||
#endif
|
||||
|
|
|
@ -31,6 +31,7 @@ static const int16_t * logo = deflogo;
|
|||
#ifdef HAS_USBKEY
|
||||
#include "USBHost_t36.h" // Read this header first for key info
|
||||
USBHost myusb;
|
||||
USBHub hub1(myusb);
|
||||
KeyboardController keyboard1(myusb);
|
||||
#endif
|
||||
static uint8_t usbnavpad=0;
|
||||
|
|
|
@ -93,7 +93,7 @@ void emu_DrawLine(unsigned char * VBuf, int width, int height, int line)
|
|||
{
|
||||
if (!vgaMode) {
|
||||
#ifdef HAS_T4_VGA
|
||||
tft.writeLine(width,1,line, VBuf, palette8);
|
||||
tft.writeLine(width,height,line, VBuf, palette8);
|
||||
#else
|
||||
tft.writeLine(width,1,line, VBuf, palette16);
|
||||
#endif
|
||||
|
|
|
@ -31,6 +31,7 @@ static const uint16_t * logo = deflogo;
|
|||
#ifdef HAS_USBKEY
|
||||
#include "USBHost_t36.h" // Read this header first for key info
|
||||
USBHost myusb;
|
||||
USBHub hub1(myusb);
|
||||
KeyboardController keyboard1(myusb);
|
||||
#endif
|
||||
static uint8_t usbnavpad=0;
|
||||
|
|
|
@ -91,7 +91,7 @@ void emu_DrawLine(unsigned char * VBuf, int width, int height, int line)
|
|||
{
|
||||
if (!vgaMode) {
|
||||
#ifdef HAS_T4_VGA
|
||||
tft.writeLine(width,1,line, VBuf, palette8);
|
||||
tft.writeLine(width,height,line, VBuf, palette8);
|
||||
#else
|
||||
tft.writeLine(width,1,line, VBuf, palette16);
|
||||
#endif
|
||||
|
|
|
@ -31,6 +31,7 @@ static const uint16_t * logo = deflogo;
|
|||
#ifdef HAS_USBKEY
|
||||
#include "USBHost_t36.h" // Read this header first for key info
|
||||
USBHost myusb;
|
||||
USBHub hub1(myusb);
|
||||
KeyboardController keyboard1(myusb);
|
||||
#endif
|
||||
static uint8_t usbnavpad=0;
|
||||
|
|
|
@ -31,6 +31,7 @@ static const uint16_t * logo = deflogo;
|
|||
#ifdef HAS_USBKEY
|
||||
#include "USBHost_t36.h" // Read this header first for key info
|
||||
USBHost myusb;
|
||||
USBHub hub1(myusb);
|
||||
KeyboardController keyboard1(myusb);
|
||||
#endif
|
||||
static uint8_t usbnavpad=0;
|
||||
|
|
|
@ -31,6 +31,7 @@ static const int16_t * logo = deflogo;
|
|||
#ifdef HAS_USBKEY
|
||||
#include "USBHost_t36.h" // Read this header first for key info
|
||||
USBHost myusb;
|
||||
USBHub hub1(myusb);
|
||||
KeyboardController keyboard1(myusb);
|
||||
#endif
|
||||
static uint8_t usbnavpad=0;
|
||||
|
|
|
@ -31,6 +31,7 @@ static const int16_t * logo = deflogo;
|
|||
#ifdef HAS_USBKEY
|
||||
#include "USBHost_t36.h" // Read this header first for key info
|
||||
USBHost myusb;
|
||||
USBHub hub1(myusb);
|
||||
KeyboardController keyboard1(myusb);
|
||||
#endif
|
||||
static uint8_t usbnavpad=0;
|
||||
|
|
|
@ -31,6 +31,7 @@ static const uint16_t * logo = deflogo;
|
|||
#ifdef HAS_USBKEY
|
||||
#include "USBHost_t36.h" // Read this header first for key info
|
||||
USBHost myusb;
|
||||
USBHub hub1(myusb);
|
||||
KeyboardController keyboard1(myusb);
|
||||
#endif
|
||||
static uint8_t usbnavpad=0;
|
||||
|
|
|
@ -31,6 +31,7 @@ static const uint16_t * logo = deflogo;
|
|||
#ifdef HAS_USBKEY
|
||||
#include "USBHost_t36.h" // Read this header first for key info
|
||||
USBHost myusb;
|
||||
USBHub hub1(myusb);
|
||||
KeyboardController keyboard1(myusb);
|
||||
#endif
|
||||
static uint8_t usbnavpad=0;
|
||||
|
|
|
@ -94,7 +94,7 @@ void emu_DrawLine(unsigned char * VBuf, int width, int height, int line)
|
|||
{
|
||||
if (!vgaMode) {
|
||||
#ifdef HAS_T4_VGA
|
||||
tft.writeLine(width,1,line, VBuf, palette8);
|
||||
tft.writeLine(width,height,line, VBuf, palette8);
|
||||
#else
|
||||
tft.writeLine(width,1,line, VBuf, palette16);
|
||||
#endif
|
||||
|
|
|
@ -31,6 +31,7 @@ static const int16_t * logo = deflogo;
|
|||
#ifdef HAS_USBKEY
|
||||
#include "USBHost_t36.h" // Read this header first for key info
|
||||
USBHost myusb;
|
||||
USBHub hub1(myusb);
|
||||
KeyboardController keyboard1(myusb);
|
||||
#endif
|
||||
static uint8_t usbnavpad=0;
|
||||
|
|
|
@ -93,7 +93,7 @@ void emu_DrawLine(unsigned char * VBuf, int width, int height, int line)
|
|||
{
|
||||
if (!vgaMode) {
|
||||
#ifdef HAS_T4_VGA
|
||||
tft.writeLine(width,1,line, VBuf, palette8);
|
||||
tft.writeLine(width,height,line, VBuf, palette8);
|
||||
#else
|
||||
tft.writeLine(width,1,line, VBuf, palette16);
|
||||
#endif
|
||||
|
|
|
@ -31,6 +31,7 @@ static const int16_t * logo = deflogo;
|
|||
#ifdef HAS_USBKEY
|
||||
#include "USBHost_t36.h" // Read this header first for key info
|
||||
USBHost myusb;
|
||||
USBHub hub1(myusb);
|
||||
KeyboardController keyboard1(myusb);
|
||||
#endif
|
||||
static uint8_t usbnavpad=0;
|
||||
|
|
|
@ -93,7 +93,7 @@ void emu_DrawLine(unsigned char * VBuf, int width, int height, int line)
|
|||
{
|
||||
if (!vgaMode) {
|
||||
#ifdef HAS_T4_VGA
|
||||
tft.writeLine(width,1,line, VBuf, palette8);
|
||||
tft.writeLine(width,height,line, VBuf, palette8);
|
||||
#else
|
||||
tft.writeLine(width,1,line, VBuf, palette16);
|
||||
#endif
|
||||
|
|
|
@ -31,6 +31,7 @@ static const uint16_t * logo = deflogo;
|
|||
#ifdef HAS_USBKEY
|
||||
#include "USBHost_t36.h" // Read this header first for key info
|
||||
USBHost myusb;
|
||||
USBHub hub1(myusb);
|
||||
KeyboardController keyboard1(myusb);
|
||||
#endif
|
||||
static uint8_t usbnavpad=0;
|
||||
|
|
|
@ -94,7 +94,7 @@ void emu_DrawLine(unsigned char * VBuf, int width, int height, int line)
|
|||
{
|
||||
if (!vgaMode) {
|
||||
#ifdef HAS_T4_VGA
|
||||
tft.writeLine(width,1,line, VBuf, palette8);
|
||||
tft.writeLine(width,height,line, VBuf, palette8);
|
||||
#else
|
||||
tft.writeLine(width,1,line, VBuf, palette16);
|
||||
#endif
|
||||
|
|
|
@ -139,6 +139,7 @@ extern void emu_DrawLine8(unsigned char * VBuf, int width, int height, int line)
|
|||
extern void emu_DrawVsync(void);
|
||||
extern int emu_FrameSkip(void);
|
||||
extern void * emu_LineBuffer(int line);
|
||||
extern void emu_tweakVideo(int shiftdelta, int numdelta, int denomdelta);
|
||||
|
||||
extern void emu_InitJoysticks(void);
|
||||
extern int emu_SwapJoysticks(int statusOnly);
|
||||
|
|
|
@ -195,6 +195,12 @@ void * emu_LineBuffer(int line)
|
|||
#endif
|
||||
}
|
||||
|
||||
void emu_tweakVideo(int shiftdelta, int numdelta, int denomdelta) {
|
||||
#ifdef HAS_T4_VGA
|
||||
tft.tweak_video(shiftdelta, numdelta, denomdelta);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
// ****************************************************
|
||||
// the setup() method runs once, when the sketch starts
|
||||
|
|
|
@ -486,9 +486,9 @@ void flush_line(int y)
|
|||
{
|
||||
if(y >= 0 && y < WIN_H) {
|
||||
#ifdef HAS_T4_VGA
|
||||
emu_DrawLine8((unsigned char *)slinebuf, WIN_W , 1, y);
|
||||
emu_DrawLine8((unsigned char *)slinebuf, WIN_W , WIN_H, y);
|
||||
#else
|
||||
emu_DrawLine16((unsigned short *)slinebuf, WIN_W , 1, y);
|
||||
emu_DrawLine16((unsigned short *)slinebuf, WIN_W , WIN_H, y);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
@ -524,7 +524,8 @@ static bool pdown=true;
|
|||
void flush_screen(int ystart,int ystop)
|
||||
{
|
||||
emu_DrawVsync();
|
||||
|
||||
emu_tweakVideo(1,0,0);
|
||||
|
||||
// #sample written per frame
|
||||
int wdelta = 0;
|
||||
uae_u32 wdpt = sndbufpt;
|
||||
|
|
Ładowanie…
Reference in New Issue