imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

contrib: rpc_examples: haskell: fix ftbs with current libraries 

And get rid of some warnings along the way.

Change-Id: I8fdbe1fa304276be6b0f25249b902b3576aa3793
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/5987
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Paul Fertser 2020-12-23 23:28:52 +03:00 committed by Antonio Borneo
parent b5098754cf
commit f67d7a3c48
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/rpc_examples/ocdrpc.hs
View File

@ -16,13 +16,11 @@
module Main where module Main where
import Prelude import Prelude
import Control.Applicative
import Network.Socket import Network.Socket
import System.IO.Streams.Core hiding (connect) import System.IO.Streams.Core hiding (connect)
import System.IO.Streams.Network import System.IO.Streams.Network
import System.IO.Streams.Attoparsec import System.IO.Streams.Attoparsec
import Data.Attoparsec.ByteString.Char8 import Data.Attoparsec.ByteString.Char8
import Data.Attoparsec.Combinator
import Data.ByteString.Char8 hiding (putStrLn, concat, map) import Data.ByteString.Char8 hiding (putStrLn, concat, map)
import Text.Printf import Text.Printf
@ -38,15 +36,14 @@ mdwParser = (manyTill anyChar (string ": ") *>
`sepBy` string " \n" `sepBy` string " \n"
ocdMdw :: (InputStream ByteString, OutputStream ByteString) -> Integer -> Integer -> IO [Integer] ocdMdw :: (InputStream ByteString, OutputStream ByteString) -> Integer -> Integer -> IO [Integer]
ocdMdw s start count = do ocdMdw s start qnt = do
s <- ocdExec s $ "mdw " ++ show start ++ " " ++ show count res <- ocdExec s $ "mdw " ++ show start ++ " " ++ show qnt
case parseOnly mdwParser (pack s) of case parseOnly mdwParser (pack res) of
Right r -> return $ concat r Right r -> return $ concat r
main = do main = do
osock <- socket AF_INET Stream defaultProtocol osock <- socket AF_INET Stream defaultProtocol
haddr <- inet_addr "127.0.0.1" connect osock (SockAddrInet 6666 $ tupleToHostAddress (127,0,0,1))
connect osock (SockAddrInet 6666 haddr)
ostreams <- socketToStreams osock ostreams <- socketToStreams osock
putStrLn "Halting the target, full log output captured:" putStrLn "Halting the target, full log output captured:"
ocdExec ostreams "capture \"halt\"" >>= putStrLn ocdExec ostreams "capture \"halt\"" >>= putStrLn