Jelajahi Sumber

replaced AcAxisIo with Channels

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8405 8c9fc860-2736-0410-a75d-ab315db34111
eth.morozova 6 tahun lalu
induk
melakukan
a27a29f616
4 mengubah file dengan 17 tambahan dan 17 penghapusan
  1. 5 5
      source/AcAxiDma.Mod
  2. 3 3
      source/AcStreamVideoOut.Mod
  3. 1 1
      source/Release.Tool
  4. 8 8
      source/Zynq.DisplayLinear.Mod

+ 5 - 5
source/AcAxiDma.Mod

@@ -5,7 +5,7 @@
 module AcAxiDma;
 module AcAxiDma;
 
 
 import
 import
-	system, AcAxisIo;
+	Channels;
 
 
 const
 const
 	CmdSetAddr = 1*2;
 	CmdSetAddr = 1*2;
@@ -21,9 +21,9 @@ type
 	Address = longint;
 	Address = longint;
 
 
 	Controller* = record
 	Controller* = record
-		cfgCmd-: AcAxisIo.Output;
-		cfgData-: AcAxisIo.Output;
-		status-: AcAxisIo.Input;
+		cfgCmd-: port out;
+		cfgData-: port out;
+		status-: port in;
 
 
 		dataSize-: longint; (** size of one data element in bytes *)
 		dataSize-: longint; (** size of one data element in bytes *)
 		addr-: Address;
 		addr-: Address;
@@ -41,7 +41,7 @@ type
 	WriteController* = record(Controller)
 	WriteController* = record(Controller)
 	end;
 	end;
 
 
-	procedure InitController*(var ctl: Controller; cfgCmd, cfgData: AcAxisIo.Output; status: AcAxisIo.Input; dataSize, maxBurstLen: longint);
+	procedure InitController*(var ctl: Controller; cfgCmd, cfgData: port out; status: port in; dataSize, maxBurstLen: longint);
 	begin
 	begin
 		ctl.cfgCmd := cfgCmd;
 		ctl.cfgCmd := cfgCmd;
 		ctl.cfgData := cfgData;
 		ctl.cfgData := cfgData;

+ 3 - 3
source/AcStreamVideoOut.Mod

@@ -1,7 +1,7 @@
 module AcStreamVideoOut; (** AUTHOR ""; PURPOSE ""; *)
 module AcStreamVideoOut; (** AUTHOR ""; PURPOSE ""; *)
 
 
 import
 import
-	system, AcAxisIo;
+	Channels;
 
 
 const
 const
 	CmdSetEnabled = 0;
 	CmdSetEnabled = 0;
@@ -19,7 +19,7 @@ const
 
 
 type
 type
 	Controller* = record
 	Controller* = record
-		cfg-: AcAxisIo.Output; (** configuration port *)
+		cfg-: port out; (** configuration port *)
 		enabled-: boolean; (** TRUE if the PWM output is enabled *)
 		enabled-: boolean; (** TRUE if the PWM output is enabled *)
 		
 		
 		pixelClock-: real; (** pixel clock in Hz *)
 		pixelClock-: real; (** pixel clock in Hz *)
@@ -37,7 +37,7 @@ type
 		vertSyncPolarity-: boolean;
 		vertSyncPolarity-: boolean;
 	end;
 	end;
 
 
-	procedure InitController*(var ctl: Controller; cfg: AcAxisIo.Output; pixelClock: real);
+	procedure InitController*(var ctl: Controller; cfg: port out; pixelClock: real);
 	begin
 	begin
 		ctl.cfg := cfg;
 		ctl.cfg := cfg;
 		ctl.pixelClock := pixelClock;
 		ctl.pixelClock := pixelClock;

+ 1 - 1
source/Release.Tool

@@ -530,7 +530,7 @@ PACKAGE Drivers ARCHIVE "Drivers.zip" SOURCE "DriversSrc.zip" DESCRIPTION "Devic
 	}
 	}
 
 
 	ZYNQ & ~COOP {
 	ZYNQ & ~COOP {
-		Zynq.AcAxisIo.Mod
+		Zynq.ARM.Channels.Mod
 		AcStreamVideoOut.Mod
 		AcStreamVideoOut.Mod
 		AcAxiDma.Mod
 		AcAxiDma.Mod
 		Zynq.PsConfig.Mod
 		Zynq.PsConfig.Mod

+ 8 - 8
source/Zynq.DisplayLinear.Mod

@@ -1,7 +1,7 @@
 MODULE DisplayLinear;
 MODULE DisplayLinear;
 
 
 IMPORT SYSTEM, Displays, Plugins, Machine, Kernel, Commands, Options,
 IMPORT SYSTEM, Displays, Plugins, Machine, Kernel, Commands, Options,
-	PsConfig, AcAxisIo, Video := AcStreamVideoOut, AcAxiDma, Trace;
+	PsConfig, Channels, Video := AcStreamVideoOut, AcAxiDma, Trace;
 
 
 CONST
 CONST
 	MaxWidth = 1920;
 	MaxWidth = 1920;
@@ -137,9 +137,9 @@ VAR
 	buf: POINTER TO ARRAY OF CHAR;
 	buf: POINTER TO ARRAY OF CHAR;
 	bufAddr: ADDRESS;
 	bufAddr: ADDRESS;
 
 
-	rCfgCmd, rCfgData: AcAxisIo.Output;
-	rStatus: AcAxisIo.Input;
-	videoCfg: AcAxisIo.Output;
+	rCfgCmd, rCfgData: PORT OUT;
+	rStatus: PORT IN;
+	videoCfg: PORT OUT;
 	rdma: AcAxiDma.ReadController;
 	rdma: AcAxiDma.ReadController;
 
 
 	(*
 	(*
@@ -213,10 +213,10 @@ VAR
 		(*
 		(*
 			Setup ActiveCells components ports
 			Setup ActiveCells components ports
 		*)
 		*)
-		ASSERT(AcAxisIo.GetOutput(0,0, rCfgCmd));
-		ASSERT(AcAxisIo.GetOutput(0,1, rCfgData));
-		ASSERT(AcAxisIo.GetInput(0,0, rStatus));
-		ASSERT(AcAxisIo.GetOutput(0,2, videoCfg));
+		ASSERT(Channels.GetOutput(0,0, rCfgCmd));
+		ASSERT(Channels.GetOutput(0,1, rCfgData));
+		ASSERT(Channels.GetInput(0,0, rStatus));
+		ASSERT(Channels.GetOutput(0,2, videoCfg));
 
 
 		(*
 		(*
 			Allocate frame buffer
 			Allocate frame buffer