aboutsummaryrefslogtreecommitdiff
path: root/hsm-cam/Hsm
diff options
context:
space:
mode:
Diffstat (limited to 'hsm-cam/Hsm')
-rw-r--r--hsm-cam/Hsm/Cam.hs11
-rw-r--r--hsm-cam/Hsm/Cam/FFI.hs (renamed from hsm-cam/Hsm/Cam/FFI.hsc)12
2 files changed, 7 insertions, 16 deletions
diff --git a/hsm-cam/Hsm/Cam.hs b/hsm-cam/Hsm/Cam.hs
index 9857557..78a3e25 100644
--- a/hsm-cam/Hsm/Cam.hs
+++ b/hsm-cam/Hsm/Cam.hs
@@ -47,9 +47,7 @@ stillCapture = do
logMsg Trace $ "Still capture data available in FD " <> show fd
runCam
- :: (IOE :> es, Log "cam" :> es, Resource :> es)
- => Eff (Cam : es) a
- -> Eff es a
+ :: (IOE :> es, Log "cam" :> es, Resource :> es) => Eff (Cam : es) a -> Eff es a
runCam action = do
fdVar <- liftIO newEmptyMVar
void loggerBracket
@@ -62,16 +60,13 @@ runCam action = do
loggerAlloc = do
logMsg Info "Registering FFI logger"
loggerIO <- getLoggerIO
- loggerFFI <-
- liftIO . makeLogger $ \severity message ->
- peekCString message >>= loggerIO (toEnum severity)
+ loggerFFI <- liftIO . makeLogger $ \severity message -> peekCString message >>= loggerIO (toEnum severity)
liftIO $ registerLogger loggerFFI
return loggerFFI
loggerDealloc loggerFFI = do
logMsg Info "Unregistering FFI logger"
liftIO $ freeHaskellFunPtr loggerFFI
- requestCallbackBracket fdVar =
- allocateEff requestCallbackAlloc requestCallbackDealloc
+ requestCallbackBracket fdVar = allocateEff requestCallbackAlloc requestCallbackDealloc
where
requestCallbackAlloc = do
logMsg Info "Registering FFI callback"
diff --git a/hsm-cam/Hsm/Cam/FFI.hsc b/hsm-cam/Hsm/Cam/FFI.hs
index 44f3f4b..93d2f57 100644
--- a/hsm-cam/Hsm/Cam/FFI.hsc
+++ b/hsm-cam/Hsm/Cam/FFI.hs
@@ -18,8 +18,7 @@ type Logger = Int -> CString -> IO ()
type Callback = Int -> IO ()
-foreign import ccall safe "wrapper"
- makeLogger :: Logger -> IO (FunPtr Logger)
+foreign import ccall safe "wrapper" makeLogger :: Logger -> IO (FunPtr Logger)
foreign import capi safe "Cam.hpp register_logger"
registerLogger :: FunPtr Logger -> IO ()
@@ -30,11 +29,8 @@ foreign import ccall safe "wrapper"
foreign import capi safe "Cam.hpp register_callback"
registerCallback :: FunPtr Callback -> IO ()
-foreign import capi safe "Cam.hpp initialize_ffi"
- initializeFFI :: IO ()
+foreign import capi safe "Cam.hpp initialize_ffi" initializeFFI :: IO ()
-foreign import capi safe "Cam.hpp shutdown_ffi"
- shutdownFFI :: IO ()
+foreign import capi safe "Cam.hpp shutdown_ffi" shutdownFFI :: IO ()
-foreign import capi safe "Cam.hpp request_capture"
- requestCapture :: IO ()
+foreign import capi safe "Cam.hpp request_capture" requestCapture :: IO ()