Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 2 commits
  • 3 files changed
  • 0 comments
  • 2 contributors
2  boards/milkymist-one/rtl/system.v
@@ -917,7 +917,7 @@ sysctl #(
917 917
 	.ninputs(7),
918 918
 	.noutputs(2),
919 919
 	.clk_freq(`CLOCK_FREQUENCY),
920  
-	.systemid(32'h11004D31) /* 1.1.0 final (0) on M1 */
  920
+	.systemid(32'h12004D31) /* 1.2.0 final (0) on M1 */
921 921
 ) sysctl (
922 922
 	.sys_clk(sys_clk),
923 923
 	.sys_rst(sys_rst),
24  softusb-input/main.c
@@ -29,6 +29,18 @@
29 29
 
30 30
 //#define	TRIGGER
31 31
 
  32
+#ifdef TRIGGER
  33
+
  34
+#define	TRIGGER_ON()	wio8(SIE_SEL_TX, 3)
  35
+#define	TRIGGER_OFF()	wio8(SIE_SEL_TX, 2)
  36
+
  37
+#else
  38
+
  39
+#define	TRIGGER_ON()	((void) 0)
  40
+#define	TRIGGER_OFF()	((void) 0)
  41
+
  42
+#endif /* !TRIGGER */
  43
+
32 44
 enum {
33 45
 	USB_PID_OUT	= 0xe1,
34 46
 	USB_PID_IN	= 0x69,
@@ -291,15 +303,15 @@ static int control_transfer(unsigned char addr, struct setup_packet *p,
291 303
 	usb_buffer[0] = USB_PID_DATA0;
292 304
 	memcpy(&usb_buffer[1], p, 8);
293 305
 	usb_crc16(&usb_buffer[1], 8, &usb_buffer[9]);
294  
-#ifdef TRIGGER
295  
-wio8(SIE_SEL_TX, 3);
296  
-#endif
  306
+
  307
+	TRIGGER_ON();
  308
+
297 309
 	/* send them back-to-back */
298 310
 	usb_tx(setup, 3);
299 311
 	usb_tx(usb_buffer, 11);
300  
-#ifdef TRIGGER
301  
-wio8(SIE_SEL_TX, 2);
302  
-#endif
  312
+
  313
+	TRIGGER_OFF();
  314
+
303 315
 	/* get ACK token from device */
304 316
 	if(usb_rx_ack() != 1) {
305 317
 		print_string(setup_ack);
2  software/include/base/version.h
... ...
@@ -1,6 +1,6 @@
1 1
 #ifndef __VERSION_H
2 2
 #define __VERSION_H
3 3
 
4  
-#define VERSION "1.1"
  4
+#define VERSION "1.2"
5 5
 
6 6
 #endif /* __VERSION_H */

No commit comments for this range

Something went wrong with that request. Please try again.