Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 3 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
2  boards/milkymist-one/rtl/system.v
View
@@ -899,7 +899,7 @@ sysctl #(
.csr_addr(4'h1),
.ninputs(7),
.noutputs(2),
- .systemid(32'h10044D31) /* 1.0.0 RC4 on M1 */
+ .systemid(32'h10004D31) /* 1.0.0 final (0) on M1 */
) sysctl (
.sys_clk(sys_clk),
.sys_rst(sys_rst),
27 boards/milkymist-one/standby/standby.v
View
@@ -1,6 +1,6 @@
/*
* Milkymist VJ SoC
- * Copyright (C) 2007, 2008, 2009, 2010 Sebastien Bourdeauducq
+ * Copyright (C) 2007, 2008, 2009, 2010, 2011 Sebastien Bourdeauducq
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -88,14 +88,29 @@ reg btn1_r0;
reg btn1_r;
reg btn2_r0;
reg btn2_r;
+reg btn2_r2;
+
+wire debounce;
always @(posedge clk) begin
- btn1_r0 <= btn1;
- btn1_r <= btn1_r0;
- btn2_r0 <= btn2;
- btn2_r <= btn2_r0;
+ if(debounce) begin
+ btn1_r0 <= btn1;
+ btn1_r <= btn1_r0;
+ btn2_r0 <= btn2;
+ btn2_r <= btn2_r0;
+ btn2_r2 <= btn2_r;
+ end
+end
+
+initial begin
+ btn2_r0 <= 1'b1;
+ btn2_r <= 1'b1;
+ btn2_r2 <= 1'b1;
end
+reg [19:0] debounce_r;
+always @(posedge clk) debounce_r <= debounce_r + 20'd1;
+assign debounce = &debounce_r;
reg ce_r;
reg [15:0] d_r;
@@ -183,7 +198,7 @@ always @(*) begin
case(state)
IDLE: begin
next_rescue = btn1_r;
- if(btn2_r)
+ if(btn2_r & ~btn2_r2)
next_state = DUMMY;
end
DUMMY: begin
2  software/bios/main.c
View
@@ -482,10 +482,10 @@ static int test_user_abort()
c = readchar();
if((c == 'Q')||(c == '\e')) {
puts("I: Aborted boot on user request");
- vga_set_console(1);
return 0;
}
if(c == 0x07) {
+ vga_unblank();
vga_set_console(1);
netboot();
return 0;
2  software/include/base/version.h
View
@@ -1,6 +1,6 @@
#ifndef __VERSION_H
#define __VERSION_H
-#define VERSION "1.0RC4"
+#define VERSION "1.0"
#endif /* __VERSION_H */

No commit comments for this range

Something went wrong with that request. Please try again.