d239fd85fd
Changes since 2.10: Enhancements in v4.00: * New Features - Major Architectural changes - First pass twice faster (reduced iterations) - Detect DDR2/3 brands and part numbers on Intel DDR2/3 chipsets - Added detection for Intel "Clarkdale" CPU - Added detection for Intel "Gulftown" CPU - Added detection for AMD "Magny-Cours" CPU - Added detection for Intel XMP Memory - Added for CPU w/ 0.5/1.5/3/6/12/16/18/24MB L3 - Added "clean" DMI detection for DDR3/FBDIMM2 - Better detection of Integrated Memory Controllers * Bug Fixes - Corrected detection for Intel "Lynnfield" CPU - Corrected detection for AMD 45nm K10 CPU - Solved crash with AMD Geode LX - Complies with SMBIOS 2.6.1 specs - Fixed compilation issues with gcc 4.2+ - Many others bug fixes Memtest86+ "3.00" was skipped and renamed 4.00 in order to avoid confusion with the original Memtest. Enhancements in v2.11 : - Added support for Intel Core i5 (Lynnfield) CPU - Added support for Intel P55 Southbridge - Added support for Intel PM45/GM45/GM47 Mobile chipset - Added support for Intel GL40/GS45 Mobile chipset - Corrected DDR2/DDR3 detection on Intel x35/x45 - Corrected detection on some Core i7 CPU - Fixed a bug with some AMI BIOS (freeze at startup) - Various bug fixes
62 lines
1.5 KiB
Text
62 lines
1.5 KiB
Text
$NetBSD: patch-ab,v 1.4 2009/11/24 17:20:40 jakllsch Exp $
|
|
|
|
--- test.c.orig 2009-09-22 00:35:46.000000000 +0000
|
|
+++ test.c
|
|
@@ -11,10 +11,32 @@
|
|
|
|
#include "test.h"
|
|
#include "config.h"
|
|
-#include <sys/io.h>
|
|
#include "dmi.h"
|
|
#include <inttypes.h>
|
|
|
|
+static __inline void
|
|
+pkg_outb (unsigned char value, unsigned short int port)
|
|
+{
|
|
+ __asm__ __volatile__ ("outb %b0,%w1": :"a" (value), "Nd" (port));
|
|
+}
|
|
+
|
|
+static __inline void
|
|
+pkg_outb_p (unsigned char value, unsigned short int port)
|
|
+{
|
|
+ __asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80": :"a" (value),
|
|
+ "Nd" (port));
|
|
+}
|
|
+
|
|
+static __inline unsigned char
|
|
+pkg_inb_p (unsigned short int port)
|
|
+{
|
|
+ unsigned char _v;
|
|
+
|
|
+ __asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
|
|
+ return _v;
|
|
+}
|
|
+
|
|
+
|
|
extern int segs, bail;
|
|
extern volatile ulong *p;
|
|
extern ulong p1, p2;
|
|
@@ -1414,18 +1436,18 @@ void beep(unsigned int frequency)
|
|
unsigned int count = 1193180 / frequency;
|
|
|
|
// Switch on the speaker
|
|
- outb_p(inb_p(0x61)|3, 0x61);
|
|
+ pkg_outb_p(pkg_inb_p(0x61)|3, 0x61);
|
|
|
|
// Set command for counter 2, 2 byte write
|
|
- outb_p(0xB6, 0x43);
|
|
+ pkg_outb_p(0xB6, 0x43);
|
|
|
|
// Select desired Hz
|
|
- outb_p(count & 0xff, 0x42);
|
|
- outb((count >> 8) & 0xff, 0x42);
|
|
+ pkg_outb_p(count & 0xff, 0x42);
|
|
+ pkg_outb((count >> 8) & 0xff, 0x42);
|
|
|
|
// Block for 100 microseconds
|
|
sleep(100, 1);
|
|
|
|
// Switch off the speaker
|
|
- outb(inb_p(0x61)&0xFC, 0x61);
|
|
+ pkg_outb(pkg_inb_p(0x61)&0xFC, 0x61);
|
|
}
|