rpm/memtest86_
SHA256
1
0
Fork 0
forked from pool/memtest86_
Code Pull Requests Activity

- Do not enable serial by default, console=ttySx,... still works

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/memtest86+?expand=0&rev=10
This commit is contained in:
Thomas Renninger 2011-03-30 11:45:23 +00:00 committed by Git OBS Bridge
parent 64a3710dea
commit 3977e8e216
3 changed files with 5 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
memtest86+.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 30 11:47:34 UTC 2011 - trenn@suse.de
- Do not enable serial by default, console=ttySx,... still works
-------------------------------------------------------------------
Tue Mar 29 15:23:33 CEST 2011 - trenn@suse.de

2
memtest86+.spec
View File

@ -37,7 +37,6 @@ Provides: memtest86 > 3.2
Url: http://www.memtest.org
Source: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.bz2
Patch0: fix-destdir
Patch1: serial-enable
Summary: Memory Testing Image for x86 Architecture
%description
@ -62,7 +61,6 @@ Authors:
%prep
%setup
%patch0 -p1
%patch1 -p1
%build
make

62
serial-enable
View File

@ -1,62 +0,0 @@
---
config.h | 2 +-
init.c | 4 ++++
serial.h | 10 ++++++----
3 files changed, 11 insertions(+), 5 deletions(-)
Index: memtest86+-4.20/config.h
===================================================================
--- memtest86+-4.20.orig/config.h
+++ memtest86+-4.20/config.h
@@ -13,7 +13,7 @@
/* 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. */
-#define SERIAL_CONSOLE_DEFAULT 0
+#define SERIAL_CONSOLE_DEFAULT 1
/* SERIAL_TTY - The default serial port to use. 0=ttyS0, 1=ttyS1 */
#define SERIAL_TTY 0
Index: memtest86+-4.20/init.c
===================================================================
--- memtest86+-4.20.orig/init.c
+++ memtest86+-4.20/init.c
@@ -42,6 +42,7 @@ static void cpu_type(void);
static void cacheable(void);
static int cpuspeed(void);
int beepmode, fail_safe;
+extern short serial_cons;
/* Failsafe function */
/* msec: number of ms to wait - scs: scancode expected to stop */
@@ -125,6 +126,9 @@ static void display_init(void)
}
serial_echo_print("\x1B[0m");
+
+ if (!serial_cons && SERIAL_CONSOLE_DEFAULT)
+ cprint (23, 0, "Timout on serial console: disabled");
}
/*
Index: memtest86+-4.20/serial.h
===================================================================
--- memtest86+-4.20.orig/serial.h
+++ memtest86+-4.20/serial.h
@@ -140,10 +140,12 @@
#define serial_echo_inb(a) inb((a)+serial_base_ports[serial_tty])
#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
/* Wait for transmitter & holding register to empty */
-#define WAIT_FOR_XMITR \
- do { \
- lsr = serial_echo_inb(UART_LSR); \
- } while ((lsr & BOTH_EMPTY) != BOTH_EMPTY)
+#define WAIT_FOR_XMITR \
+ int _i = 1<<15; \
+ do { \
+ lsr = serial_echo_inb(UART_LSR); \
+ } while ((lsr & BOTH_EMPTY) != BOTH_EMPTY && --_i); \
+ if (!_i) serial_cons = 0
#if 0
static inline void serial_echo(int ch)