From 307cb1b1094c73fd15eab378c27ac0073696b739 Mon Sep 17 00:00:00 2001
From: Paul Oliver <contact@pauloliver.dev>
Date: Tue, 19 Aug 2025 03:56:40 +0000
Subject: Improves formatting

---
 hsm-cam/Hsm/Cam.hs      | 11 +++--------
 hsm-cam/Hsm/Cam/FFI.hs  | 36 ++++++++++++++++++++++++++++++++++++
 hsm-cam/Hsm/Cam/FFI.hsc | 40 ----------------------------------------
 3 files changed, 39 insertions(+), 48 deletions(-)
 create mode 100644 hsm-cam/Hsm/Cam/FFI.hs
 delete mode 100644 hsm-cam/Hsm/Cam/FFI.hsc

(limited to 'hsm-cam/Hsm')

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.hs b/hsm-cam/Hsm/Cam/FFI.hs
new file mode 100644
index 0000000..93d2f57
--- /dev/null
+++ b/hsm-cam/Hsm/Cam/FFI.hs
@@ -0,0 +1,36 @@
+{-# LANGUAGE CApiFFI #-}
+
+module Hsm.Cam.FFI
+  ( makeLogger
+  , registerLogger
+  , makeCallback
+  , registerCallback
+  , initializeFFI
+  , shutdownFFI
+  , requestCapture
+  )
+where
+
+import Foreign.C.String (CString)
+import Foreign.Ptr (FunPtr)
+
+type Logger = Int -> CString -> IO ()
+
+type Callback = Int -> IO ()
+
+foreign import ccall safe "wrapper" makeLogger :: Logger -> IO (FunPtr Logger)
+
+foreign import capi safe "Cam.hpp register_logger"
+  registerLogger :: FunPtr Logger -> IO ()
+
+foreign import ccall safe "wrapper"
+  makeCallback :: Callback -> IO (FunPtr Callback)
+
+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 shutdown_ffi" shutdownFFI :: IO ()
+
+foreign import capi safe "Cam.hpp request_capture" requestCapture :: IO ()
diff --git a/hsm-cam/Hsm/Cam/FFI.hsc b/hsm-cam/Hsm/Cam/FFI.hsc
deleted file mode 100644
index 44f3f4b..0000000
--- a/hsm-cam/Hsm/Cam/FFI.hsc
+++ /dev/null
@@ -1,40 +0,0 @@
-{-# LANGUAGE CApiFFI #-}
-
-module Hsm.Cam.FFI
-  ( makeLogger
-  , registerLogger
-  , makeCallback
-  , registerCallback
-  , initializeFFI
-  , shutdownFFI
-  , requestCapture
-  )
-where
-
-import Foreign.C.String (CString)
-import Foreign.Ptr (FunPtr)
-
-type Logger = Int -> CString -> IO ()
-
-type Callback = Int -> IO ()
-
-foreign import ccall safe "wrapper"
-  makeLogger :: Logger -> IO (FunPtr Logger)
-
-foreign import capi safe "Cam.hpp register_logger"
-  registerLogger :: FunPtr Logger -> IO ()
-
-foreign import ccall safe "wrapper"
-  makeCallback :: Callback -> IO (FunPtr Callback)
-
-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 shutdown_ffi"
-  shutdownFFI :: IO ()
-
-foreign import capi safe "Cam.hpp request_capture"
-  requestCapture :: IO ()
-- 
cgit v1.2.1