X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=48d624e8b8afbc177e869c28ff81d2a4bd7f5860;hb=7eee9ddbc137d48c8224b0e7187d5f90339ccc3f;hp=270b0ecd70ae36640ee28bc1aeee1da6f2d809ff;hpb=cadac01133f837417e095159308867aeb166cc86;p=slipway.git

diff --git a/Makefile b/Makefile
index 270b0ec..48d624e 100644
--- a/Makefile
+++ b/Makefile
@@ -9,14 +9,17 @@ endif
 ## slipway ############################################################################
 
 run: slipway.jar 
-	java -cp slipway.jar edu.berkeley.obits.AtmelSerial < bitstreams/led0.md4
+	java -cp slipway.jar edu.berkeley.slipway.Demo 30
+
+demo: slipway.jar 
+	java -cp slipway.jar edu.berkeley.slipway.Demo2 30
 
 build/src/com/ftdi/usb/FtdiUart.c: src/com/ftdi/usb/FtdiUart.i
 	mkdir -p `dirname $@`
 	mkdir -p src/com/ftdi/usb
 	swig -module FtdiUartNative -noproxy -package com.ftdi.usb -o $@ -outdir `dirname $@` -java $<
 
-build/$(jnilib): build/src/com/ftdi/usb/FtdiUart.c
+build/$(jnilib): build/src/com/ftdi/usb/FtdiUart.c upstream/libusb/.built
 	gcc -I. -Iupstream/libftdi -Iupstream/usb \
 		-I$(JAVA_HOME)/include \
 		$< \
@@ -25,10 +28,10 @@ build/$(jnilib): build/src/com/ftdi/usb/FtdiUart.c
 		$(linkerflags) \
 		-o $@ -dynamiclib -framework JavaVM
 
-slipway.jar: build/$(jnilib) $(shell find src build/src -name \*.java) bitstreams/slipway_drone.bst
+slipway.jar: build/$(jnilib) $(shell find src build/src -name \*.java) misc/slipway_drone.bst
 	mkdir -p build
-	javac -d build $(shell find src build/src -name \*.java)
-	cp bitstreams/slipway_drone.bst build/edu/berkeley/slipway/
+	$(javac) -d build $(shell find src build/src -name \*.java)
+	cp misc/slipway_drone.bst build/edu/berkeley/slipway/
 	cd build; jar cvf ../$@ .
 
 
@@ -42,29 +45,32 @@ upstream/libusb:
 
 upstream/libusb/.built: upstream/libusb
 	cd upstream/libusb; \
-		./configure &&
+		./configure && \
 		make
 	touch $@
 
+javac = javac -cp upstream/jhdl-edifparser.jar
 #java = java -Djava.library.path=$(shell pwd)/lib/ -cp lib/RXTXcomm.jar:slipway.jar
 
 
 
 ## for rebuilding usbdrone.hex ###########################################################
 
-build/slipway_drone.hex: src/edu/berkeley/slipway/slipway_drone.c  upstream/avr-libc/.built
+build/slipway_drone.hex: src/edu/berkeley/slipway/FtdiBoardSlave.c  upstream/avr-libc/.built
 	upstream/prefix/bin/avr-gcc -O3 -mmcu=at94k $< -o $@.o
 	upstream/prefix/bin/avr-objcopy -O ihex $@.o $@
 
 # this only works on my personal setup [adam]
-bitstreams/slipway_drone.bst: build/slipway_drone.hex
-	cp $< /afs/research.cs.berkeley.edu/user/megacz/edu.berkeley.obits/usbdrone.hex
-	fs flush /afs/research.cs.berkeley.edu/user/megacz/edu.berkeley.obits/usbdrone.hex
+misc/slipway_drone.bst: build/slipway_drone.hex
+	cp $<    /afs/research.cs.berkeley.edu/user/megacz/slipway/$<
+	fs flush /afs/research.cs.berkeley.edu/user/megacz/slipway/$<
 	echo okay...
 	read
-	rm /afs/research.cs.berkeley.edu/user/megacz/edu.berkeley.obits/usbdrone.hex
-	diff -u /afs/research.cs.berkeley.edu/user/megacz/stupid/fpslic_stupid.bst $@ && exit -1; true
-	mv /afs/research.cs.berkeley.edu/user/megacz/stupid/fpslic_stupid.bst $@
+	rm /afs/research.cs.berkeley.edu/user/megacz/slipway/$<
+	diff -u /afs/research.cs.berkeley.edu/user/megacz/slipway/$@ $@ && \
+		exit -1; true
+	mv /afs/research.cs.berkeley.edu/user/megacz/slipway/$@ $@
+	touch $@
 
 
 
@@ -107,4 +113,33 @@ upstream/avr-libc/.built: upstream/avr-libc upstream/gcc/.built
 		./configure --prefix=$(shell pwd)/upstream/prefix --host=avr && \
 		PATH=$$PATH:$(shell pwd)/upstream/prefix/bin make && \
 		PATH=$$PATH:$(shell pwd)/upstream/prefix/bin make install
-	touch $@
\ No newline at end of file
+	touch $@
+
+mpardemo: upstream/jhdl-edifparser.jar slipway.jar
+	iverilog  -t fpga -s main -o out.edf misc/mpardemo.v
+	java -cp slipway.jar:upstream/jhdl-edifparser.jar edu.berkeley.slipway.mpar.MPARDemo out.edf
+
+
+## edif parser ##########################################################################
+
+upstream/jhdl-edifparser.jar:
+	mkdir -p upstream
+	curl -o $@- http://reliability.ee.byu.edu/edif/jars/release_0.3.0/edif-0.3.0.jar
+	mv $@- $@
+
+## javadoc ##############################################################################
+
+javadoc:
+	rm -rf doc/api
+	mkdir -p doc/api
+	javadoc \
+		-linksource \
+		-windowtitle "abits" \
+		-sourcepath src \
+		-public \
+		-notree \
+		-noindex \
+		-nonavbar \
+		-noqualifier all \
+		-d doc/api \
+		`find src -name \*.java`