Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 2 contributors
Commits on Nov 30, 2011
@sbourdeauducq sbourdeauducq Bump version number 33e91c9
@wpwrak wpwrak softusb: move implementation of trigger into macros
This is just a bit of cleanup.

- Werner
398cf75
View
2  boards/milkymist-one/rtl/system.v
@@ -917,7 +917,7 @@ sysctl #(
.ninputs(7),
.noutputs(2),
.clk_freq(`CLOCK_FREQUENCY),
- .systemid(32'h11004D31) /* 1.1.0 final (0) on M1 */
+ .systemid(32'h12004D31) /* 1.2.0 final (0) on M1 */
) sysctl (
.sys_clk(sys_clk),
.sys_rst(sys_rst),
View
24 softusb-input/main.c
@@ -29,6 +29,18 @@
//#define TRIGGER
+#ifdef TRIGGER
+
+#define TRIGGER_ON() wio8(SIE_SEL_TX, 3)
+#define TRIGGER_OFF() wio8(SIE_SEL_TX, 2)
+
+#else
+
+#define TRIGGER_ON() ((void) 0)
+#define TRIGGER_OFF() ((void) 0)
+
+#endif /* !TRIGGER */
+
enum {
USB_PID_OUT = 0xe1,
USB_PID_IN = 0x69,
@@ -291,15 +303,15 @@ static int control_transfer(unsigned char addr, struct setup_packet *p,
usb_buffer[0] = USB_PID_DATA0;
memcpy(&usb_buffer[1], p, 8);
usb_crc16(&usb_buffer[1], 8, &usb_buffer[9]);
-#ifdef TRIGGER
-wio8(SIE_SEL_TX, 3);
-#endif
+
+ TRIGGER_ON();
+
/* send them back-to-back */
usb_tx(setup, 3);
usb_tx(usb_buffer, 11);
-#ifdef TRIGGER
-wio8(SIE_SEL_TX, 2);
-#endif
+
+ TRIGGER_OFF();
+
/* get ACK token from device */
if(usb_rx_ack() != 1) {
print_string(setup_ack);
View
2  software/include/base/version.h
@@ -1,6 +1,6 @@
#ifndef __VERSION_H
#define __VERSION_H
-#define VERSION "1.1"
+#define VERSION "1.2"
#endif /* __VERSION_H */

No commit comments for this range

Something went wrong with that request. Please try again.