Le 30.11.15 11:12, Stuart Henderson a écrit :
On 2015/11/29 19:41, Mathias Schmocker wrote:
Please find here an update for memtest86+-4.20:
http://smat.ch/memtest86+.tgz for ports/sysutils/memtest86+
Please send a cvs diff, you can use "cvs add" and "cvs rm" as necessary
and "cvs diff -uNp".
Here attached the output of cvs diff -uNp , as done in sysutils/memtest86+
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /mnt2/cvs/ports/sysutils/memtest86+/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile 4 Feb 2014 10:14:52 -0000 1.10
+++ Makefile 29 Nov 2015 18:02:53 -0000
@@ -7,7 +7,7 @@ COMMENT= thorough, stand alone memory t
VERSION= 4.20
DISTNAME= memtest86+-${VERSION}
CATEGORIES= sysutils
-REVISION= 2
+REVISION= 3
HOMEPAGE= http://www.memtest.org/
cvs diff: Diffing patches
Index: patches/patch-config_h
===================================================================
RCS file: /mnt2/cvs/ports/sysutils/memtest86+/patches/patch-config_h,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-config_h
--- patches/patch-config_h 9 Feb 2009 14:54:40 -0000 1.1.1.1
+++ patches/patch-config_h 28 Nov 2015 12:42:29 -0000
@@ -1,8 +1,6 @@
-$OpenBSD: patch-config_h,v 1.1.1.1 2009/02/09 14:54:40 form Exp $
-$RuOBSD: patch-config_h,v 1.1.1.1 2008/07/12 19:00:53 form Exp $
---- config.h.orig Thu Feb 21 17:26:05 2008
-+++ config.h Mon Mar 24 22:04:20 2008
-@@ -13,7 +13,9 @@
+--- config.h.orig Sun Jan 23 19:11:04 2011
++++ config.h Sat Nov 28 09:41:25 2015
+@@ -13,13 +13,15 @@
/* SERIAL_CONSOLE_DEFAULT - The default state of the serial console. */
/* This is normally off since it slows down testing. Change to a 1 */
/* to enable. */
@@ -12,3 +10,10 @@ $RuOBSD: patch-config_h,v 1.1.1.1 2008/0
/* SERIAL_TTY - The default serial port to use. 0=ttyS0, 1=ttyS1 */
#define SERIAL_TTY 0
+
+ /* SERIAL_BAUD_RATE - Baud rate for the serial console */
+-#define SERIAL_BAUD_RATE 9600
++#define SERIAL_BAUD_RATE 115200
+
+ /* START_FAIL_SAFE - Default 0 = normal. Change to 1 to always start in fail
safe mode */
+ #define START_FAIL_SAFE 0
Index: patches/patch-lib_c
===================================================================
RCS file: patches/patch-lib_c
diff -N patches/patch-lib_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_c 29 Nov 2015 17:04:39 -0000
@@ -0,0 +1,106 @@
+patch based on PR 138925 http://bugs.freebsd.org
+--- lib.c.orig Sun Jan 23 19:11:04 2011
++++ lib.c Fri Nov 27 18:10:35 2015
+@@ -577,23 +577,26 @@
+ int get_key() {
+ int c;
+
+- c = inb(0x64);
+- if ((c & 1) == 0) {
+- if (serial_cons) {
+- int comstat;
+- comstat = serial_echo_inb(UART_LSR);
+- if (comstat & UART_LSR_DR) {
+- c = serial_echo_inb(UART_RX);
+- /* Pressing '.' has same effect as 'c'
+- on a keyboard.
+- Oct 056 Dec 46 Hex 2E Ascii .
+- */
+- return (ascii_to_keycode(c));
+- }
++ if (serial_cons) {
++ int comstat;
++ comstat = serial_echo_inb(UART_LSR);
++ if (comstat & UART_LSR_DR) {
++ c = serial_echo_inb(UART_RX);
++ /* Pressing '.' has same effect as 'c'
++ on a keyboard.
++ Oct 056 Dec 46 Hex 2E Ascii .
++ */
++ return (ascii_to_keycode(c));
+ }
+ return(0);
+ }
+- c = inb(0x60);
++
++ /* Poll the Keyboard Controler */
++ c = inb(0x64);
++ if ((c & 1) == 0)
++ return(0);
++ else
++ c = inb(0x60);
+ return((c));
+ }
+
+@@ -609,7 +612,13 @@
+
+ /* tell the BIOS to do a warm start */
+ *((unsigned short *)0x472) = 0x1234;
+- outb(0xfe,0x64);
++ if (!serial_cons)
++ /* Try Keyboard Controler */
++ outb(0xfe,0x64);
++
++ /* Try Reset Control Register */
++ outb(0x02,0xcf9);
++ outb(0x06,0xcf9);
+ break;
+ case 46:
+ /* c - Configure */
+@@ -802,11 +811,33 @@
+ serial_echo_outb(lcr, UART_LCR); /* Done with divisor */
+
+
+- /* Prior to disabling interrupts, read the LSR and RBR
+- * registers */
+- comstat = serial_echo_inb(UART_LSR); /* COM? LSR */
+- comstat = serial_echo_inb(UART_RX); /* COM? RBR */
+- serial_echo_outb(0x00, UART_IER); /* Disable all interrupts */
++ /* Disable interrupts */
++ comstat = serial_echo_inb(UART_IER);
++ comstat &= 0xf0;
++ serial_echo_outb(comstat, UART_IER);
++
++ /* disable fifo */
++ serial_echo_outb(0, UART_FCR);
++
++ /* Clear pending interrupts */
++ while (((comstat = serial_echo_inb(UART_IIR)) & UART_IIR_NO_INT) == 0) {
++ comstat &= 0x0f;
++ switch (comstat) {
++ case UART_IIR_RLSI:
++ lsr = serial_echo_inb(UART_LSR);
++ if (lsr & (UART_LSR_BI|UART_LSR_FE|UART_LSR_PE))
++ (void)serial_echo_inb(UART_RX);
++ break;
++ case UART_IIR_RDI:
++ case UART_IIR_RDI|0x8: /* fifo */
++ (void)serial_echo_inb(UART_RX);
++ break;
++ case UART_IIR_MSI:
++ (void)serial_echo_inb(UART_MSR);
++ default:
++ break;
++ }
++ }
+
+ clear_screen_buf();
+
+@@ -854,6 +885,7 @@
+ { 9, 0x0f}, /* ^I/TAB -> TAB */
+ { 19, 0x39}, /* ^S -> SP */
+ { 17, 28}, /* ^Q -> CR */
++ { 80, 0x3B}, /* F1 key for failsafe on serial_cons (and 'P') */
+
+ { ' ', 0x39}, /* SP -> SP */
+ { 'a', 0x1e},
cvs diff: Diffing pkg
Index: pkg/README
===================================================================
RCS file: /mnt2/cvs/ports/sysutils/memtest86+/pkg/README,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 README
--- pkg/README 4 Feb 2014 10:14:52 -0000 1.3
+++ pkg/README 29 Nov 2015 17:03:11 -0000
@@ -19,5 +19,5 @@ o Use `${PREFIX}/share/memtest86+/memtes
Use `memtest-serial', `memtest-serial.floppy' or `memtest-serial.iso' files
instead if you wish to use serial console (requires DEC VT100 or compatible
-terminal/emulator). Set you terminal/emulator to 9600,8,N,1 mode if this is
+terminal/emulator). Set you terminal/emulator to 115200,8,N,1 mode if this is
the case.
