diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2010-03-09 07:53:38 -0800 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2010-03-09 07:53:38 -0800 |
| commit | 5642e3be330b707254625de7ce33fa219edf0ab9 (patch) | |
| tree | d149d3b3f91463556ce953e6bf792335e522e9cf | |
| parent | 06ba14e55b200b9aa0314f63b38c08f30613859f (diff) | |
| parent | 904b35c689d38694913606c569a9d324533ff765 (diff) | |
| download | uhd-5642e3be330b707254625de7ce33fa219edf0ab9.tar.gz uhd-5642e3be330b707254625de7ce33fa219edf0ab9.tar.bz2 uhd-5642e3be330b707254625de7ce33fa219edf0ab9.zip | |
Merge commit 'upstream/master'
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | usrp2/control_lib/ram_2port.v | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 74c36c862..b275f0e49 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *~ \#*\# +a.out diff --git a/usrp2/control_lib/ram_2port.v b/usrp2/control_lib/ram_2port.v index 6c8332b9c..3716a7c8a 100644 --- a/usrp2/control_lib/ram_2port.v +++ b/usrp2/control_lib/ram_2port.v @@ -21,7 +21,7 @@ module ram_2port integer i; initial for(i=0;i<(1<<AWIDTH);i=i+1) - ram[i] <= {AWIDTH{1'b0}}; + ram[i] <= {DWIDTH{1'b0}}; always @(posedge clka) begin if (ena) |