Test rx only modification in fdserial

Remove rxOnly variable from fdserial structure and use mode bits that the PASM ignores.
parallaxinc · Dec 18, 2017 · b3f5a30 · b3f5a30
1 parent bc7ff15
commit b3f5a30
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/Learn/Simple Libraries/TextDevices/libfdserial/cmm/libfdserial.a b/Learn/Simple Libraries/TextDevices/libfdserial/cmm/libfdserial.a
diff --git a/Learn/Simple Libraries/TextDevices/libfdserial/fdserial.c b/Learn/Simple Libraries/TextDevices/libfdserial/fdserial.c
@@ -53,13 +53,13 @@ fdserial *fdserial_open(int rxpin, int txpin, int mode, int baudrate)
   {
     fdptr->tx_pin = fdptr->rx_pin;
     fdptr->mode |= FDSERIAL_MODE_OPENDRAIN_TX;
-    fdptr->mode &= (~FDSERIAL_MODE_RX_ONLY);
-    fdptr->rxOnly = 1;
+    //fdptr->mode &= (~FDSERIAL_MODE_RX_ONLY);
+    //fdptr->rxOnly = 1;
   }
-  else
-  {
-    fdptr->rxOnly = 0;
-  }    
+  //else
+  //{
+  //  fdptr->rxOnly = 0;
+  //}    
 
   /* now start the kernel */
 #if defined(__PROPELLER_USE_XMM__)
@@ -142,7 +142,8 @@ int fdserial_txChar(fdserial *term, int txbyte)
 {
   int rc = -1;
   fdserial_st *fdptr = (fdserial_st *) term->devst;
-  if(!fdptr->rxOnly)
+  //if(!fdptr->rxOnly)
+  if(fdptr->mode & FDSERIAL_MODE_RX_ONLY)
   {    
     volatile fdserial_st* fdp = (fdserial_st*) term->devst;
     volatile char* txbuf = (volatile char*) fdp->buffptr + FDSERIAL_BUFF_MASK+1;

diff --git a/Learn/Simple Libraries/TextDevices/libfdserial/fdserial.h b/Learn/Simple Libraries/TextDevices/libfdserial/fdserial.h
@@ -100,7 +100,7 @@ typedef struct fdserial_struct
     /** interface mode */       int  mode;      
     /** clkfreq / baud */       int  ticks;     
     /** pointer to rx buffer */ char *buffptr;   
-    /** rx-only mode */         char  rxOnly;     
+    /** rx-only mode */         //char  rxOnly;     
 } fdserial_st;
 
 /**

diff --git a/Learn/Simple Libraries/TextDevices/libfdserial/libfdserial.side b/Learn/Simple Libraries/TextDevices/libfdserial/libfdserial.side
@@ -4,7 +4,7 @@ fdserial_utils.c
 pst.spin
 fdserial.c
 >compiler=C
->memtype=cmm main ram compact
+>memtype=lmm main ram
 >optimize=-Os
 >-m32bit-doubles
 >-Wall

diff --git a/Learn/Simple Libraries/TextDevices/libfdserial/lmm/libfdserial.a b/Learn/Simple Libraries/TextDevices/libfdserial/lmm/libfdserial.a
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v1.4.35
+v1.4.36