浏览代码

Use proper types

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8110 8c9fc860-2736-0410-a75d-ab315db34111
negelef 7 年之前
父节点
当前提交
a07a8f44b3

+ 1 - 1
source/InitNetwork.Mod

@@ -1007,7 +1007,7 @@ END Removed;
 
 
 (* Handle events of installed/removed devices *)
-PROCEDURE EventHandler(event: LONGINT; plugin: Plugins.Plugin);
+PROCEDURE EventHandler(event: WORD; plugin: Plugins.Plugin);
 BEGIN
 	IF event = Plugins.EventAdd THEN
 		Added(plugin(Network.LinkDevice));

+ 1 - 1
source/Joysticks.Mod

@@ -458,7 +458,7 @@ VAR
 	registry- : Plugins.Registry;
 	nextId : LONGINT;
 
-PROCEDURE EventHandler(event : LONGINT; plugin : Plugins.Plugin);
+PROCEDURE EventHandler(event : WORD; plugin : Plugins.Plugin);
 VAR
 	joystick : Joystick;
 	connectedMsg : JoystickConnectedMessage; disconnectedMsg : JoystickDisconnectedMessage;

+ 1 - 1
source/MinInitNetwork.Mod

@@ -139,7 +139,7 @@ END Removed;
 
 
 (* Handle events of installed/removed devices *)
-PROCEDURE EventHandler(event: LONGINT; plugin: Plugins.Plugin);
+PROCEDURE EventHandler(event: WORD; plugin: Plugins.Plugin);
 BEGIN
 	IF event = Plugins.EventAdd THEN
 		Added(plugin(Network.LinkDevice));

+ 2 - 2
source/PartitionsLib.Mod

@@ -517,7 +517,7 @@ TYPE
 			IF lockLevel = 0 THEN lockedBy := NIL; END
 		END Release;
 
-		PROCEDURE DiskEventHandler(event : LONGINT; plugin : Plugins.Plugin);
+		PROCEDURE DiskEventHandler(event : WORD; plugin : Plugins.Plugin);
 		VAR tempTable : Plugins.Table; dev : AosDisks.Device; i, j : LONGINT;
 		BEGIN
 			ASSERT(plugin#NIL);
@@ -4153,4 +4153,4 @@ BEGIN
 	BootLoaderName := "OBL.Bin";
 END PartitionsLib.
 
-System.Free PartitionsLib ~
+System.Free PartitionsLib ~

+ 7 - 7
source/Plugins.Mod

@@ -40,7 +40,7 @@ TYPE
 	PluginHandler* = PROCEDURE {DELEGATE} (p: Plugin);
 
 	(** Event handler (upcall) *)
-	EventHandler* = PROCEDURE {DELEGATE} (event: LONGINT; plugin: Plugin);
+	EventHandler* = PROCEDURE {DELEGATE} (event: WORD; plugin: Plugin);
 
 	(* List item of event handler list *)
 	EventHandlerList = POINTER TO RECORD
@@ -55,7 +55,7 @@ TYPE
 	Registry* = OBJECT (Plugin)
 		VAR
 			root: Plugin;	(* list of registered plugins, in order of registration *)
-			added: LONGINT;	(* number of plugins successfully added (for synchronization) *)
+			added: SIZE;	(* number of plugins successfully added (for synchronization) *)
 			handlers: EventHandlerList;	(* list of installed event handlers *)
 
 		(** Get a specific plugin.  If name = "", get the first existing plugin.  Return NIL if it was not found. *)
@@ -73,7 +73,7 @@ TYPE
 		(** Like Get, but wait until the plugin is available. *)
 
 		PROCEDURE Await*(CONST name: ARRAY OF CHAR): Plugin;
-		VAR p: Plugin; num: LONGINT;
+		VAR p: Plugin; num: SIZE;
 		BEGIN {EXCLUSIVE}
 			LOOP
 				p := root;
@@ -100,7 +100,7 @@ TYPE
 		(** Get a table of available plugin instances in the registry, in order of registration.  If none are available, table = NIL, otherwise LEN(table^) is the number of available plugins. *)
 
 		PROCEDURE GetAll*(VAR table: Table);
-		VAR p: Plugin; num, i: LONGINT;
+		VAR p: Plugin; num, i: SIZE;
 		BEGIN {EXCLUSIVE}
 			num := 0; p := root;	(* get number of entries *)
 			WHILE p # NIL DO INC(num); p := p.link END;
@@ -230,8 +230,8 @@ TYPE
 VAR
 	main*: Registry;	(** registry of all registries (excluding itself) *)
 
-PROCEDURE AppendInt(x: LONGINT; VAR to: ARRAY OF CHAR);
-VAR i, m: LONGINT;
+PROCEDURE AppendInt(x: SIZE; VAR to: ARRAY OF CHAR);
+VAR i, m: SIZE;
 BEGIN
 	ASSERT(x >= 0);
 	i := 0; WHILE to[i] # 0X DO INC(i) END;
@@ -248,7 +248,7 @@ BEGIN
 	to[i] := 0X
 END AppendInt;
 
-PROCEDURE GenName(n: LONGINT; VAR registry, plugin: Name);
+PROCEDURE GenName(n: SIZE; VAR registry, plugin: Name);
 BEGIN
 	COPY(registry, plugin);
 	AppendInt(n, plugin)

+ 1 - 1
source/Usb.Mod

@@ -1660,7 +1660,7 @@ BEGIN {EXCLUSIVE}
 	END;
 END GetRootHubs;
 
-PROCEDURE RootHubEvent(event : LONGINT; plugin : Plugins.Plugin);
+PROCEDURE RootHubEvent(event : WORD; plugin : Plugins.Plugin);
 VAR hcd : UsbHcdi.Hcd;
 BEGIN
 	hcd := plugin(UsbHcdi.Hcd);

+ 2 - 2
source/WMPerfMonPluginDisks.Mod

@@ -80,7 +80,7 @@ BEGIN {EXCLUSIVE}
 	WMPerfMonPlugins.updater.RemoveByName(PluginName, devicename);
 END RemovePlugin;
 
-PROCEDURE EventHandler(event : LONGINT; plugin : Plugins.Plugin);
+PROCEDURE EventHandler(event : WORD; plugin : Plugins.Plugin);
 BEGIN
 	IF event = Plugins.EventAdd THEN
 		AddPlugin(plugin (Disks.Device))
@@ -117,4 +117,4 @@ BEGIN
 	InitPlugins;
 END WMPerfMonPluginDisks.
 
-WMPerfMonPluginDisks.Install ~ System.Free WMPerfMonPluginDisks ~
+WMPerfMonPluginDisks.Install ~ System.Free WMPerfMonPluginDisks ~

+ 1 - 1
source/WMPerfMonPluginNetwork.Mod

@@ -59,7 +59,7 @@ BEGIN {EXCLUSIVE}
 	WMPerfMonPlugins.updater.RemoveByName(PluginName, devicename);
 END RemovePlugin;
 
-PROCEDURE EventHandler(event : LONGINT; plugin : Plugins.Plugin);
+PROCEDURE EventHandler(event : WORD; plugin : Plugins.Plugin);
 BEGIN
 	IF event = Plugins.EventAdd THEN
 		AddPlugin(plugin (Network.LinkDevice))

+ 2 - 2
source/WMPerfMonPluginUsb.Mod

@@ -75,7 +75,7 @@ BEGIN {EXCLUSIVE}
 	WMPerfMonPlugins.updater.RemoveByName(PluginName, devicename);
 END RemovePlugin;
 
-PROCEDURE EventHandler(event : LONGINT; plugin : Plugins.Plugin);
+PROCEDURE EventHandler(event : WORD; plugin : Plugins.Plugin);
 BEGIN
 	IF event = Plugins.EventAdd THEN
 		AddPlugin(plugin (UsbHcdi.Hcd));
@@ -112,4 +112,4 @@ BEGIN
 	InitPlugins;
 END WMPerfMonPluginUsb.
 
-WMPerfMonPluginUsb.Install ~	System.Free WMPerfMonPluginUsb ~
+WMPerfMonPluginUsb.Install ~	System.Free WMPerfMonPluginUsb ~