Browse Source

use SET32 explicitly

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8606 8c9fc860-2736-0410-a75d-ab315db34111
eth.morozova 6 years ago
parent
commit
7f607f1984
2 changed files with 9 additions and 9 deletions
  1. 8 8
      source/Zynq.ARM.Channels.Mod
  2. 1 1
      source/Zynq.ARM.Platform.Mod

+ 8 - 8
source/Zynq.ARM.Channels.Mod

@@ -544,14 +544,14 @@ VAR
 
 	END ReceiveMultiple;
 
-	OPERATOR "<<"*(port: Output; x: SET); BEGIN Send(port,SYSTEM.VAL(LONGINT,x)); END "<<";
-	OPERATOR ">>"*(x: SET; port: Output); BEGIN Send(port,SYSTEM.VAL(LONGINT,x)); END ">>";
-	OPERATOR "<<?"*(port: Output; x: SET): BOOLEAN; BEGIN RETURN SendNonBlocking(port,SYSTEM.VAL(LONGINT,x)); END "<<?";
-	OPERATOR ">>?"*(x: SET; port: Output): BOOLEAN; BEGIN RETURN SendNonBlocking(port,SYSTEM.VAL(LONGINT,x)); END ">>?";
-	OPERATOR ">>"*(port: Input; VAR x: SET); BEGIN Receive(port,SYSTEM.VAL(LONGINT,x)); END ">>";
-	OPERATOR "<<"*(VAR x: SET; port: Input); BEGIN Receive(port,SYSTEM.VAL(LONGINT,x)); END "<<";
-	OPERATOR ">>?"*(port: Input; VAR x: SET): BOOLEAN; BEGIN RETURN ReceiveNonBlocking(port,SYSTEM.VAL(LONGINT,x)); END ">>?";
-	OPERATOR "<<?"*(VAR x: SET; port: Input): BOOLEAN; BEGIN RETURN ReceiveNonBlocking(port,SYSTEM.VAL(LONGINT,x)); END "<<?";
+	OPERATOR "<<"*(port: Output; x: SET32); BEGIN Send(port,SYSTEM.VAL(LONGINT,x)); END "<<";
+	OPERATOR ">>"*(x: SET32; port: Output); BEGIN Send(port,SYSTEM.VAL(LONGINT,x)); END ">>";
+	OPERATOR "<<?"*(port: Output; x: SET32): BOOLEAN; BEGIN RETURN SendNonBlocking(port,SYSTEM.VAL(LONGINT,x)); END "<<?";
+	OPERATOR ">>?"*(x: SET32; port: Output): BOOLEAN; BEGIN RETURN SendNonBlocking(port,SYSTEM.VAL(LONGINT,x)); END ">>?";
+	OPERATOR ">>"*(port: Input; VAR x: SET32); BEGIN Receive(port,SYSTEM.VAL(LONGINT,x)); END ">>";
+	OPERATOR "<<"*(VAR x: SET32; port: Input); BEGIN Receive(port,SYSTEM.VAL(LONGINT,x)); END "<<";
+	OPERATOR ">>?"*(port: Input; VAR x: SET32): BOOLEAN; BEGIN RETURN ReceiveNonBlocking(port,SYSTEM.VAL(LONGINT,x)); END ">>?";
+	OPERATOR "<<?"*(VAR x: SET32; port: Input): BOOLEAN; BEGIN RETURN ReceiveNonBlocking(port,SYSTEM.VAL(LONGINT,x)); END "<<?";
 
 	OPERATOR "<<"*(port: Output; x: REAL); BEGIN Send(port,SYSTEM.VAL(LONGINT,x)); END "<<";
 	OPERATOR ">>"*(x: REAL; port: Output); BEGIN Send(port,SYSTEM.VAL(LONGINT,x)); END ">>";

+ 1 - 1
source/Zynq.ARM.Platform.Mod

@@ -195,7 +195,7 @@ TYPE
 		SMC_RST_CTRL*: LONGINT; (** 0x00000234 32 rw 0x00000000 SMC Software Reset Control *)
 		OCM_RST_CTRL*: LONGINT; (** 0x00000238 32 rw 0x00000000 OCM Software Reset Control *)
 		padding3: LONGINT;
-		FPGA_RST_CTRL*: SET; (** 0x00000240 32 rw 0x01F33F0F FPGA Software Reset Control *)
+		FPGA_RST_CTRL*: SET32; (** 0x00000240 32 rw 0x01F33F0F FPGA Software Reset Control *)
 		A9_CPU_RST_CTRL*: LONGINT; (** 0x00000244 32 rw 0x00000000 CPU Reset and Clock control *)
 		padding4: LONGINT;
 		RS_AWDT_CTRL*: LONGINT; (** 0x0000024C 32 rw 0x00000000 Watchdog Timer Reset Control *)