X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Devices%2FmTaskDevice.dcl;h=2af19ea25c1f2fe7a8b7ddad6f056c73f158e3e4;hb=6b9b7f62df51ee3f48a78ae05b8b8f287ecce5b2;hp=17acd10809c1f611d48ae49bfa71ea18849d479c;hpb=32ff545d18253da21f25c69c6d99b96f90668773;p=mTask.git

diff --git a/Devices/mTaskDevice.dcl b/Devices/mTaskDevice.dcl
index 17acd10..2af19ea 100644
--- a/Devices/mTaskDevice.dcl
+++ b/Devices/mTaskDevice.dcl
@@ -10,7 +10,7 @@ import mTaskInterpret
 import Generics.gCons
 import iTasksTTY
 
-derive class iTask MTaskDevice, MTaskDeviceSpec, MTaskResource, MTaskMSGRecv, MTaskMSGSend, BCShare
+derive class iTask MTaskDevice, MTaskResource, MTaskMSGRecv, MTaskMSGSend, BCShare
 derive conses MTaskResource, TCPSettings
 derive consName MTaskResource, TCPSettings
 
@@ -28,6 +28,7 @@ derive consName MTaskResource, TCPSettings
 		, deviceTasks :: [MTaskTask]
 		, deviceData :: MTaskResource
 		, deviceSpec :: Maybe MTaskDeviceSpec
+		, deviceShares :: [MTaskShare]
 	}
 
 instance == MTaskDevice
@@ -35,13 +36,16 @@ instance == MTaskDevice
 class MTaskDuplex a where
 	synFun :: a (Shared Channels) -> Task ()
 
+withDevice :: (MTaskDevice -> Task a) String -> Task a | iTask a
+
 startupDevices :: Task [MTaskDevice]
 connectDevice :: (MTaskDevice (Shared Channels) -> Task ()) MTaskDevice -> Task ()
 manageDevices :: (MTaskDevice (Shared Channels) -> Task ()) [MTaskDevice] -> Task ()
-sendToDevice :: String (Main (ByteCode () Stmt)) (MTaskDevice, MTaskInterval) -> Task ()
 sendMessages :: [MTaskMSGSend] -> (MTaskDevice -> Task Channels)
 
+withDevices :: MTaskDevice (MTaskDevice -> MTaskDevice) -> Task ()
+
 deviceTaskDelete :: MTaskDevice MTaskTask -> Task ()
-deviceTaskAcked :: MTaskDevice Int -> Task ()
+deviceTaskAcked :: MTaskDevice Int Int -> Task ()
 deviceTaskDeleteAcked :: MTaskDevice Int -> Task ()
 deviceAddSpec :: MTaskDevice MTaskDeviceSpec -> Task ()