API.md

@@ -123,11 +123,9 @@ a remote socket to send you data.
 
 ##### Returns
 
-* 0 on timeout.
+* 0 on timeout
-* -1 on error. Use `Socket Errno` for more detail.
+* -1,-2 on error
-* -3 on the socket being sorta-ready. This isn't a connection timeout,
+* 1 on success
-  so check again.
-* 1 on success.
 
 #### RESULT=Socket Async Wait Writing(Socket, Wait_ms)
 
@@ -137,11 +135,9 @@ has been completed.
 
 ##### Returns
 
-* 0 on timeout.
+* 0 on timeout
-* -1 on error. Use `Socket Errno` for more detail.
+* -1,-2 on error
-* -3 on the socket being sorta-ready. This isn't a connection timeout,
+* 1 on success
-  so check again.
-* 1 on success.
 
 #### RESULT=Socket Set Timeout(Socket, Wait_ms)
 

README.md

@@ -139,11 +139,6 @@ Doing something cool with the extension?
     most system-friendly way of doing this.
 * MiamiDX can be fiddly, at least it is on my MiSTer set up.
   If Internet connectivity is not working, try re-connecting to the network.
-* If using Roadshow, `bsdsocket.library` will always be available, so
-  you can't use its presence or lack thereof to test if Internet is available.
-  You'll have to use a combination of DNS lookups and/or connection
-  timeouts using `Socket Async Wait Writing` to determine if the Internet
-  is available.
 
 ## Versioning
 

src/BSDSocket.s

@@ -7,7 +7,7 @@
 ; extension number 18
 ExtNb           equ 18-1
 Version         MACRO
-                dc.b "1.0.1-20230403"
+                dc.b "1.0.0-20230401"
                 ENDM
 VerNumber       equ $1
 
@@ -1576,7 +1576,6 @@ _DoSocketLibraryClose_Skip:
 ;
 ;   @return
 ;     1 on success
-;     -1 on error, check Socket Errno
 ;     -2 on library not open
 ;     -3 on not interesting yet
 ;     0 on timeout
@@ -1628,13 +1627,8 @@ _SocketWaitAsyncWriting_LibraryOpen:
         MOVE.L BSDSocketBase-MB(A4),A6
         CALLLIB WaitSelect
 
-        ; returns:
+        TST.L D0 ; timeout, pass through
-        ; * 0 on timeout
+        BPL _SocketWaitAsyncWriting_Done
-        ; * >0 on socket was seen
-        ; * -1 on error
-        TST.L D0
-        BEQ _SocketWaitAsyncWriting_Timeout
-        BMI _SocketWaitAsyncWriting_Error
       MOVE.L (SP)+,D0 ; D0 contains socket again
 
       Dload A4
@@ -1673,9 +1667,8 @@ _SocketWaitAsyncWriting_CheckSockopt:
       MOVE.L (SP)+,A3
 
       TST.L D0
-      BEQ _SocketWaitAsyncWriting_Ready
+      BPL _SocketWaitAsyncWriting_Ready
 
-    ; still not ready
     MOVEM.L (SP)+,A3-A4
     MOVE.L #-3,D3
 
@@ -1689,20 +1682,11 @@ _SocketWaitAsyncWriting_Ready:
     RestoreStackFunction
     Ret_Int
 
-_SocketWaitAsyncWriting_Error:
+_SocketWaitAsyncWriting_Done:
       MOVE.L (SP)+,D1
     MOVEM.L (SP)+,A3-A4
 
-    MOVE.L #-1,D3
+    MOVE.L D0,D3
-
-    RestoreStackFunction
-    Ret_Int
-
-_SocketWaitAsyncWriting_Timeout:
-      MOVE.L (SP)+,D1
-    MOVEM.L (SP)+,A3-A4
-
-    MOVEQ #0,D3
 
     RestoreStackFunction
     Ret_Int