X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Devices%2FmTaskDevice.dcl;h=b1c7accc0968b45fb1326b02f5ad77b36f9274dd;hb=7d9088b54956fe56c36ca8d01ec386b48f0a1c47;hp=cae651920dab32ed8092869cf2263148a40279c4;hpb=c518754bec4758cce7d899463f9c68612c3bf4e4;p=mTask.git

diff --git a/Devices/mTaskDevice.dcl b/Devices/mTaskDevice.dcl
index cae6519..b1c7acc 100644
--- a/Devices/mTaskDevice.dcl
+++ b/Devices/mTaskDevice.dcl
@@ -28,6 +28,7 @@ derive consName MTaskResource, TCPSettings
 		, deviceTasks :: [MTaskTask]
 		, deviceData :: MTaskResource
 		, deviceSpec :: Maybe MTaskDeviceSpec
+		, deviceShares :: [MTaskShare]
 	}
 
 instance == MTaskDevice
@@ -35,15 +36,18 @@ 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 ()
-sendMessages :: [MTaskMSGSend] -> (MTaskDevice -> Task Channels)
-getDevice :: String -> Task MTaskDevice
+
+sendMessages :: [MTaskMSGSend] MTaskDevice -> Task Channels
+sendMessagesIW :: [MTaskMSGSend] MTaskDevice *IWorld -> *(MaybeError TaskException (), *IWorld)
 
 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 ()