1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
--- test.c.orig 2007-01-04 06:43:54.000000000 +0000
+++ test.c 2007-12-08 13:08:18.000000000 +0000
@@ -11,9 +11,30 @@
#include "test.h"
#include "config.h"
-#include <sys/io.h>
#include "dmi.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, beepmode;
extern volatile ulong *p;
@@ -1753,18 +1774,18 @@
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);
}
|
