Message

Reply | Reply all

Date Prev | Date Next | Thread Prev | Thread Next Date Index | Thread Index

From: cvs at opencores.org<cvs@o...>
Date: Wed Aug 16 01:21:13 CEST 2006
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/06/08 16:01:21

Modified: jop/java/target/src/test/test Flash.java
Log:
Added ST NAND Flash


Revision Changes Path
1.4 jop/java/target/src/test/test/Flash.java

http://www.opencores.org/cvsweb.shtml/jop/java/target/src/test/test/Flash.java.diff?r1=1.3&r2=1.4

(In the diff below, changes in quantity of whitespace are not shown.)

Index: Flash.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/test/test/Flash.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Flash.java 26 Jun 2005 14:56:20 -0000 1.3
+++ Flash.java 15 Aug 2006 23:21:13 -0000 1.4
@@ -42,13 +42,19 @@
//
// should read 0x98 and 0x73
//
- i = Native.rdMem(0x100000);
- j = Native.rdMem(0x100000);
+ i = Native.rdMem(0x100000); // Manufacturer
+ j = Native.rdMem(0x100000); // Size
Dbg.wr("NAND ");
Dbg.hexVal(i);
Dbg.hexVal(j);
if (i==0x198) {
Dbg.wr("Toshiba ");
+ } else if (i==0x120) {
+ Dbg.wr("ST ");
+ } else {
+ Dbg.wr("Unknown manufacturer\n");
+ }
+
if (j==0x173) {
Dbg.wr("16 MB\n");
} else if (j==0x175) {
@@ -60,16 +66,13 @@
} else {
Dbg.wr("error reading NAND\n");
}
- } else {
- Dbg.wr("error reading NAND\n");
- }

//
// read status, should be 0xc0
//
Native.wrMem(0x70, 0x100001);
- i = Native.rdMem(0x100000);
- j = Native.rdMem(0x100000);
+ i = Native.rdMem(0x100000)&0x1c1;
+ j = Native.rdMem(0x100000)&0x1c1;
Dbg.hexVal(i);
Dbg.hexVal(j);
if (i==0x1c0 && j==0x1c0) {