diff options
Diffstat (limited to 'hsm-cam')
| -rw-r--r-- | hsm-cam/Hsm/Cam.hs | 3 | ||||
| -rw-r--r-- | hsm-cam/hsm-cam.cabal | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/hsm-cam/Hsm/Cam.hs b/hsm-cam/Hsm/Cam.hs index c82cdd7..fe17057 100644 --- a/hsm-cam/Hsm/Cam.hs +++ b/hsm-cam/Hsm/Cam.hs @@ -44,6 +44,7 @@ import Hsm.Cam.FFI , stopCamera , stopCameraManager ) +import Hsm.Core.Bracket (bracketConst, bracketLiftIO_) import Hsm.Log (Log, Severity(Attention, Info, Trace), getLevel, logMsg, makeLoggerIO) import MMAP (mapShared, mkMmapFlags, mmap, munmap, protRead) import System.Directory (doesFileExist, removeFile) @@ -127,8 +128,6 @@ runCam action = do . bracketLiftIO_ createRequest (return ()) . bracket mapDmaBuffer unmapDmaBuffer $ \dmaBuffer -> evalStaticRep (Cam Rep {..}) action where - bracketConst alloc dealloc = bracket alloc dealloc . const - bracketLiftIO_ alloc dealloc = bracket_ (liftIO alloc) (liftIO dealloc) loggerAlloc = do logMsg @"cam" Info "Registering FFI logger" loggerIO <- makeLoggerIO @"cam" diff --git a/hsm-cam/hsm-cam.cabal b/hsm-cam/hsm-cam.cabal index 5c06ea7..fe767cb 100644 --- a/hsm-cam/hsm-cam.cabal +++ b/hsm-cam/hsm-cam.cabal @@ -13,6 +13,7 @@ library , directory , effectful-core , effectful-plugin + , hsm-core , hsm-log , JuicyPixels , monad-loops @@ -44,6 +45,7 @@ executable test-cam , directory , effectful-core , effectful-plugin + , hsm-core , hsm-log , JuicyPixels , monad-loops |