diff options
| author | Aleksey Veresov <aleksey@veresov.pro> | 2021-04-12 01:01:22 +0300 |
|---|---|---|
| committer | Aleksey Veresov <aleksey@veresov.pro> | 2021-04-12 01:01:22 +0300 |
| commit | 21aa1d1f11c369323d8c3bf71648bd0a8321ca61 (patch) | |
| tree | 68b29b89cb3bbb26167d990ac22dba580b9467a1 /src/Suem.hs | |
| parent | 0be6a61d0a819b057b43848632928a261021ed25 (diff) | |
| download | suem-21aa1d1f11c369323d8c3bf71648bd0a8321ca61.tar suem-21aa1d1f11c369323d8c3bf71648bd0a8321ca61.tar.xz suem-21aa1d1f11c369323d8c3bf71648bd0a8321ca61.zip | |
Device protocol is almost done!
Diffstat (limited to 'src/Suem.hs')
| -rw-r--r-- | src/Suem.hs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/Suem.hs b/src/Suem.hs index 6b2779a..7f55891 100644 --- a/src/Suem.hs +++ b/src/Suem.hs @@ -434,10 +434,6 @@ data Config = Config Int -- frequence (Maybe ConfigSocket) (Maybe ConfigSocket) -ipString :: String -> Word32 -ipString = fromIntegral . sum . map (\(n,o) -> toInteger o * 256 ^ n) - . zip [0..] . reverse . fromIPv4 . read - makeSocket :: Maybe ConfigSocket -> IO (Maybe Socket) makeSocket (Just (ConfigUnix a)) = do sock <- socket AF_UNIX Stream defaultProtocol @@ -446,9 +442,7 @@ makeSocket (Just (ConfigUnix a)) = do return $ Just sock makeSocket (Just (ConfigInet a)) = do sock <- socket AF_INET Stream defaultProtocol - Network.Socket.bind sock $ SockAddrInet - (read $ tail $ dropWhile (/= ':') a) - (ipString $ takeWhile (/= ':') a) + Network.Socket.bind sock $ SockAddrInet (read a) 0x0100007f Network.Socket.listen sock 1024 return $ Just sock makeSocket Nothing = return Nothing @@ -478,8 +472,17 @@ makeMachine ramData romData s0 s1 s2 s3 s4 s5 s6 s7 = do ms5 <- makeSocket s5 ms6 <- makeSocket s6 ms7 <- makeSocket s7 + mc0 <- newIORef Nothing + mc1 <- newIORef Nothing + mc2 <- newIORef Nothing + mc3 <- newIORef Nothing + mc4 <- newIORef Nothing + mc5 <- newIORef Nothing + mc6 <- newIORef Nothing + mc7 <- newIORef Nothing return $ Machine pc sr drs ars usp ssp ramData romData ms0 ms1 ms2 ms3 ms4 ms5 ms6 ms7 + mc0 mc1 mc2 mc3 mc4 mc5 mc6 mc7 where pcval = (fromIntegral $ romData V.! 4) * 256 * 256 * 256 + (fromIntegral $ romData V.! 5) * 256 * 256 + (fromIntegral $ romData V.! 6) * 256 + |