From b3ee7d92b04092676f4b554133fc63569b8ee3c6 Mon Sep 17 00:00:00 2001 From: jean-marcharvengt Date: Sun, 22 Nov 2020 16:56:33 +0100 Subject: [PATCH] add usb HUB by default --- MCUME_teensy/teensy5200/emuapi.cpp | 1 + MCUME_teensy/teensy64/emuapi.cpp | 1 + MCUME_teensy/teensy800/emuapi.cpp | 1 + MCUME_teensy/teensy8086/emuapi.cpp | 1 + MCUME_teensy/teensy81/emuapi.cpp | 1 + MCUME_teensy/teensy81/teensy81.ino | 2 +- MCUME_teensy/teensycolem/emuapi.cpp | 1 + MCUME_teensy/teensycolem/teensycolem.ino | 2 +- MCUME_teensy/teensygen/emuapi.cpp | 1 + MCUME_teensy/teensygen/teensygen.ino | 2 +- MCUME_teensy/teensygnuboy/emuapi.cpp | 1 + MCUME_teensy/teensymsx/emuapi.cpp | 1 + MCUME_teensy/teensynofrendo/emuapi.cpp | 1 + MCUME_teensy/teensyo2em/emuapi.cpp | 1 + MCUME_teensy/teensypce/emuapi.cpp | 1 + MCUME_teensy/teensysms/emuapi.cpp | 1 + MCUME_teensy/teensysms/teensysms.ino | 2 +- MCUME_teensy/teensyspeccy/emuapi.cpp | 1 + MCUME_teensy/teensyspeccy/teensyspeccy.ino | 2 +- MCUME_teensy/teensyvcs/emuapi.cpp | 1 + MCUME_teensy/teensyvcs/teensyvcs.ino | 2 +- MCUME_teensy/teensyvectrex/emuapi.cpp | 1 + MCUME_teensy/teensyvectrex/teensyvectrex.ino | 2 +- MCUME_teensy41/teensyuae41/emuapi.h | 1 + MCUME_teensy41/teensyuae41/teensyuae41.ino | 6 ++++++ MCUME_teensy41/teensyuae41/uae.cpp | 7 ++++--- 26 files changed, 34 insertions(+), 10 deletions(-) diff --git a/MCUME_teensy/teensy5200/emuapi.cpp b/MCUME_teensy/teensy5200/emuapi.cpp index 87b57b4..0d3e301 100644 --- a/MCUME_teensy/teensy5200/emuapi.cpp +++ b/MCUME_teensy/teensy5200/emuapi.cpp @@ -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; diff --git a/MCUME_teensy/teensy64/emuapi.cpp b/MCUME_teensy/teensy64/emuapi.cpp index 2f8aca3..12d7b53 100644 --- a/MCUME_teensy/teensy64/emuapi.cpp +++ b/MCUME_teensy/teensy64/emuapi.cpp @@ -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; diff --git a/MCUME_teensy/teensy800/emuapi.cpp b/MCUME_teensy/teensy800/emuapi.cpp index 87b57b4..0d3e301 100644 --- a/MCUME_teensy/teensy800/emuapi.cpp +++ b/MCUME_teensy/teensy800/emuapi.cpp @@ -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; diff --git a/MCUME_teensy/teensy8086/emuapi.cpp b/MCUME_teensy/teensy8086/emuapi.cpp index 87b57b4..0d3e301 100644 --- a/MCUME_teensy/teensy8086/emuapi.cpp +++ b/MCUME_teensy/teensy8086/emuapi.cpp @@ -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; diff --git a/MCUME_teensy/teensy81/emuapi.cpp b/MCUME_teensy/teensy81/emuapi.cpp index 3271841..91e6c6c 100644 --- a/MCUME_teensy/teensy81/emuapi.cpp +++ b/MCUME_teensy/teensy81/emuapi.cpp @@ -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; diff --git a/MCUME_teensy/teensy81/teensy81.ino b/MCUME_teensy/teensy81/teensy81.ino index ee7d762..bdc1a12 100644 --- a/MCUME_teensy/teensy81/teensy81.ino +++ b/MCUME_teensy/teensy81/teensy81.ino @@ -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 diff --git a/MCUME_teensy/teensycolem/emuapi.cpp b/MCUME_teensy/teensycolem/emuapi.cpp index 724b77c..5aab474 100644 --- a/MCUME_teensy/teensycolem/emuapi.cpp +++ b/MCUME_teensy/teensycolem/emuapi.cpp @@ -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; diff --git a/MCUME_teensy/teensycolem/teensycolem.ino b/MCUME_teensy/teensycolem/teensycolem.ino index c42e289..d866e83 100644 --- a/MCUME_teensy/teensycolem/teensycolem.ino +++ b/MCUME_teensy/teensycolem/teensycolem.ino @@ -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 diff --git a/MCUME_teensy/teensygen/emuapi.cpp b/MCUME_teensy/teensygen/emuapi.cpp index 87b57b4..0d3e301 100644 --- a/MCUME_teensy/teensygen/emuapi.cpp +++ b/MCUME_teensy/teensygen/emuapi.cpp @@ -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; diff --git a/MCUME_teensy/teensygen/teensygen.ino b/MCUME_teensy/teensygen/teensygen.ino index a86cb6e..1d6d529 100644 --- a/MCUME_teensy/teensygen/teensygen.ino +++ b/MCUME_teensy/teensygen/teensygen.ino @@ -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 diff --git a/MCUME_teensy/teensygnuboy/emuapi.cpp b/MCUME_teensy/teensygnuboy/emuapi.cpp index f319abe..72d1f48 100644 --- a/MCUME_teensy/teensygnuboy/emuapi.cpp +++ b/MCUME_teensy/teensygnuboy/emuapi.cpp @@ -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; diff --git a/MCUME_teensy/teensymsx/emuapi.cpp b/MCUME_teensy/teensymsx/emuapi.cpp index f319abe..72d1f48 100644 --- a/MCUME_teensy/teensymsx/emuapi.cpp +++ b/MCUME_teensy/teensymsx/emuapi.cpp @@ -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; diff --git a/MCUME_teensy/teensynofrendo/emuapi.cpp b/MCUME_teensy/teensynofrendo/emuapi.cpp index 724b77c..5aab474 100644 --- a/MCUME_teensy/teensynofrendo/emuapi.cpp +++ b/MCUME_teensy/teensynofrendo/emuapi.cpp @@ -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; diff --git a/MCUME_teensy/teensyo2em/emuapi.cpp b/MCUME_teensy/teensyo2em/emuapi.cpp index 724b77c..5aab474 100644 --- a/MCUME_teensy/teensyo2em/emuapi.cpp +++ b/MCUME_teensy/teensyo2em/emuapi.cpp @@ -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; diff --git a/MCUME_teensy/teensypce/emuapi.cpp b/MCUME_teensy/teensypce/emuapi.cpp index 87b57b4..0d3e301 100644 --- a/MCUME_teensy/teensypce/emuapi.cpp +++ b/MCUME_teensy/teensypce/emuapi.cpp @@ -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; diff --git a/MCUME_teensy/teensysms/emuapi.cpp b/MCUME_teensy/teensysms/emuapi.cpp index f319abe..72d1f48 100644 --- a/MCUME_teensy/teensysms/emuapi.cpp +++ b/MCUME_teensy/teensysms/emuapi.cpp @@ -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; diff --git a/MCUME_teensy/teensysms/teensysms.ino b/MCUME_teensy/teensysms/teensysms.ino index 37232ed..2d740b9 100644 --- a/MCUME_teensy/teensysms/teensysms.ino +++ b/MCUME_teensy/teensysms/teensysms.ino @@ -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 diff --git a/MCUME_teensy/teensyspeccy/emuapi.cpp b/MCUME_teensy/teensyspeccy/emuapi.cpp index 724b77c..5aab474 100644 --- a/MCUME_teensy/teensyspeccy/emuapi.cpp +++ b/MCUME_teensy/teensyspeccy/emuapi.cpp @@ -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; diff --git a/MCUME_teensy/teensyspeccy/teensyspeccy.ino b/MCUME_teensy/teensyspeccy/teensyspeccy.ino index 4107a3b..4ddb1e7 100644 --- a/MCUME_teensy/teensyspeccy/teensyspeccy.ino +++ b/MCUME_teensy/teensyspeccy/teensyspeccy.ino @@ -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 diff --git a/MCUME_teensy/teensyvcs/emuapi.cpp b/MCUME_teensy/teensyvcs/emuapi.cpp index 724b77c..5aab474 100644 --- a/MCUME_teensy/teensyvcs/emuapi.cpp +++ b/MCUME_teensy/teensyvcs/emuapi.cpp @@ -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; diff --git a/MCUME_teensy/teensyvcs/teensyvcs.ino b/MCUME_teensy/teensyvcs/teensyvcs.ino index 27dc1a6..30adb24 100644 --- a/MCUME_teensy/teensyvcs/teensyvcs.ino +++ b/MCUME_teensy/teensyvcs/teensyvcs.ino @@ -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 diff --git a/MCUME_teensy/teensyvectrex/emuapi.cpp b/MCUME_teensy/teensyvectrex/emuapi.cpp index f319abe..72d1f48 100644 --- a/MCUME_teensy/teensyvectrex/emuapi.cpp +++ b/MCUME_teensy/teensyvectrex/emuapi.cpp @@ -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; diff --git a/MCUME_teensy/teensyvectrex/teensyvectrex.ino b/MCUME_teensy/teensyvectrex/teensyvectrex.ino index 4f65da1..6078da4 100644 --- a/MCUME_teensy/teensyvectrex/teensyvectrex.ino +++ b/MCUME_teensy/teensyvectrex/teensyvectrex.ino @@ -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 diff --git a/MCUME_teensy41/teensyuae41/emuapi.h b/MCUME_teensy41/teensyuae41/emuapi.h index d3f1cef..4a0eaa5 100644 --- a/MCUME_teensy41/teensyuae41/emuapi.h +++ b/MCUME_teensy41/teensyuae41/emuapi.h @@ -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); diff --git a/MCUME_teensy41/teensyuae41/teensyuae41.ino b/MCUME_teensy41/teensyuae41/teensyuae41.ino index 7678ef9..3098d42 100644 --- a/MCUME_teensy41/teensyuae41/teensyuae41.ino +++ b/MCUME_teensy41/teensyuae41/teensyuae41.ino @@ -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 diff --git a/MCUME_teensy41/teensyuae41/uae.cpp b/MCUME_teensy41/teensyuae41/uae.cpp index 13d1ba1..5a40c22 100644 --- a/MCUME_teensy41/teensyuae41/uae.cpp +++ b/MCUME_teensy41/teensyuae41/uae.cpp @@ -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;