Merge pull request #32 from visrealm/dev

v 0.4.4

Author: visrealm

src/CMakeLists.txt

@@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 3.13)
 
 # compile-time options
 
-set(PICO9918_VERSION   "0.4.3")
+set(PICO9918_VERSION   "0.4.4")
 set(PICO9918_PCB_MAJOR_VER 0)
 set(PICO9918_PCB_MINOR_VER 4)
 
-set(PICO9918_SCANLINES 1)
+set(PICO9918_SCANLINES 0)
 
 # SCART RGBs options
 set(PICO9918_SCART_RGBS 0)  # 1 for RGBs, 0 for VGA

src/main.c

@@ -152,16 +152,18 @@ void  __not_in_flash_func(pio_irq_handler)()
   if ((TMS_PIO->fstat & (1u << (PIO_FSTAT_RXEMPTY_LSB + tmsWriteSm))) == 0) // write?
   {
     uint32_t writeVal = TMS_PIO->rxf[tmsWriteSm];
+    uint8_t dataVal = writeVal & 0xff;
+    writeVal >>= ((GPIO_MODE - GPIO_CD7) + 16);
 
-    if (writeVal & (GPIO_MODE_MASK >> GPIO_CD7)) // write reg/addr
+    if (writeVal & 0x01) // write reg/addr
     {
-      vrEmuTms9918WriteAddrImpl(writeVal & 0xff);
+      vrEmuTms9918WriteAddrImpl(dataVal);
       currentInt = vrEmuTms9918InterruptStatusImpl();
       gpio_put(GPIO_INT, !currentInt);
     }
     else // write data
     {
-      vrEmuTms9918WriteDataImpl(writeVal & 0xff);
+      vrEmuTms9918WriteDataImpl(dataVal);
     }
 
     nextValue = vrEmuTms9918ReadDataNoIncImpl();
@@ -381,7 +383,7 @@ void tmsPioInit()
 
   pio_sm_config writeConfig = tmsWrite_program_get_default_config(tmsWriteProgram);
   sm_config_set_in_pins(&writeConfig, GPIO_CD7);
-  sm_config_set_in_shift(&writeConfig, false, true, 16); // L shift, autopush @ 16 bits
+  sm_config_set_in_shift(&writeConfig, false, true, 32); // L shift, autopush @ 16 bits
   sm_config_set_clkdiv(&writeConfig, 1.0f);
 
   pio_sm_init(TMS_PIO, tmsWriteSm, tmsWriteProgram, &writeConfig);

src/res/splash.png

@@ -62,17 +62,20 @@ endPart:
 ; tmsWrite - monitor the CSW pin and pass on pin state via FIFO
 ;           
 ;            very simple grab the data and send it through...
+;            state at CSW going low in the high 16-bits
+;            state at CSW going high in the low 16-bits
 ;
-; fifo isr   0b|x|m|w|r|xxxx|dddddddd|
-;              | |o|r|e|    |  CD0-7 |
-;              | |d|i|a|    |        |
-;              | |e|t|d|    |        |
-;              | | |e| |    |        |
+; fifo isr   0b|x|m|w|r|xxxx|dddddddd|x|m|w|r|xxxx|dddddddd|
+;              | |o|r|e|    |  CD0-7 | | | | |    |  CD0-7 |
+;              | |d|i|a|    | ignore | | | | |    |        |
+;              | |e|t|d|    |        | | | | |    |        |
+;              | | |e| |    |        | | | | |    |        |
 
 .program tmsWrite
 .define public CSW_PIN 27
 
-  wait 0 gpio CSW_PIN [12]   ; wait for CSW to go active (low)
-  in pins, 16                ; grab the data CD0-7 and auto-push
-  wait 1 gpio CSW_PIN [12]   ; wait for CSW high (inactive)
+  wait 0 gpio CSW_PIN  ; wait for CSW to go active (low)
+  in pins, 16          ; grab the initial state
+  wait 1 gpio CSW_PIN  ; wait for CSW inactive (high)
+  in pins, 16          ; grab the final state
 .wrap