PERFORCE change 30992 for review
Peter Wemm
peter at FreeBSD.org
Sun May 11 19:46:23 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=30992
Change 30992 by peter at peter_daintree on 2003/05/11 19:46:04
IFC @30991
Affected files ...
.. //depot/projects/hammer/sys/amd64/amd64/nexus.c#6 integrate
.. //depot/projects/hammer/sys/amd64/include/bus.h#6 integrate
.. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#2 integrate
.. //depot/projects/hammer/sys/amd64/include/bus_at386.h#6 delete
.. //depot/projects/hammer/sys/amd64/include/bus_dma.h#5 integrate
.. //depot/projects/hammer/sys/amd64/include/bus_memio.h#5 integrate
.. //depot/projects/hammer/sys/amd64/include/bus_pio.h#5 integrate
.. //depot/projects/hammer/sys/dev/kbd/atkbdc.c#6 integrate
Differences ...
==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#6 (text+ko) ====
@@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.50 2003/05/01 01:05:21 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.51 2003/05/12 02:44:37 peter Exp $
*/
/*
@@ -323,9 +323,9 @@
return 0;
if (type == SYS_RES_MEMORY) {
- rman_set_bustag(rv, I386_BUS_SPACE_MEM);
+ rman_set_bustag(rv, AMD64_BUS_SPACE_MEM);
} else if (type == SYS_RES_IOPORT) {
- rman_set_bustag(rv, I386_BUS_SPACE_IO);
+ rman_set_bustag(rv, AMD64_BUS_SPACE_IO);
rman_set_bushandle(rv, rv->r_start);
}
@@ -346,7 +346,7 @@
/*
* If this is a memory resource, map it into the kernel.
*/
- if (rman_get_bustag(r) == I386_BUS_SPACE_MEM) {
+ if (rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) {
caddr_t vaddr = 0;
if (rman_get_end(r) < 1024 * 1024) {
@@ -378,7 +378,7 @@
/*
* If this is a memory resource, unmap it.
*/
- if ((rman_get_bustag(r) == I386_BUS_SPACE_MEM) &&
+ if ((rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) &&
(rman_get_end(r) >= 1024 * 1024)) {
u_int32_t psize;
==== //depot/projects/hammer/sys/amd64/include/bus.h#6 (text+ko) ====
@@ -28,17 +28,17 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/bus.h,v 1.11 2003/05/01 01:05:23 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/bus.h,v 1.12 2003/05/12 02:44:37 peter Exp $
*/
-#ifndef _I386_BUS_H_
-#define _I386_BUS_H_
+#ifndef _AMD64_BUS_H_
+#define _AMD64_BUS_H_
-#include <machine/bus_at386.h>
+#include <machine/bus_amd64.h>
#include <machine/bus_dma.h>
/*
- * Stream accesses are the same as normal accesses on i386; there are no
+ * Stream accesses are the same as normal accesses on amd64; there are no
* supported bus systems with an endianess different from the host one.
*/
#define bus_space_read_stream_1(t, h, o) bus_space_read_1((t), (h), (o))
@@ -101,4 +101,4 @@
#define bus_space_copy_region_stream_4(t, h1, o1, h2, o2, c) \
bus_space_copy_region_4((t), (h1), (o1), (h2), (o2), (c))
-#endif /* _I386_BUS_H_ */
+#endif /* _AMD64_BUS_H_ */
==== //depot/projects/hammer/sys/amd64/include/bus_amd64.h#2 (text+ko) ====
@@ -67,10 +67,10 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/amd64/include/bus_amd64.h,v 1.23 2003/05/01 01:05:23 peter Exp $ */
+/* $FreeBSD: src/sys/amd64/include/bus_amd64.h,v 1.24 2003/05/12 02:44:37 peter Exp $ */
-#ifndef _I386_BUS_AT386_H_
-#define _I386_BUS_AT386_H_
+#ifndef _AMD64_BUS_AMD64_H_
+#define _AMD64_BUS_AMD64_H_
#include <machine/cpufunc.h>
@@ -78,16 +78,16 @@
* To remain compatible with NetBSD's interface, default to both memio and
* pio when neither of them is defined.
*/
-#if !defined(_I386_BUS_PIO_H_) && !defined(_I386_BUS_MEMIO_H_)
-#define _I386_BUS_PIO_H_
-#define _I386_BUS_MEMIO_H_
+#if !defined(_AMD64_BUS_PIO_H_) && !defined(_AMD64_BUS_MEMIO_H_)
+#define _AMD64_BUS_PIO_H_
+#define _AMD64_BUS_MEMIO_H_
#endif
/*
- * Values for the i386 bus space tag, not to be used directly by MI code.
+ * Values for the amd64 bus space tag, not to be used directly by MI code.
*/
-#define I386_BUS_SPACE_IO 0 /* space is i/o space */
-#define I386_BUS_SPACE_MEM 1 /* space is mem space */
+#define AMD64_BUS_SPACE_IO 0 /* space is i/o space */
+#define AMD64_BUS_SPACE_MEM 1 /* space is mem space */
/*
* Bus address and size types
@@ -175,7 +175,7 @@
}
-#if defined(_I386_BUS_PIO_H_) || defined(_I386_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_) || defined(_AMD64_BUS_MEMIO_H_)
/*
* Read a 1, 2, 4, or 8 byte quantity from bus space
@@ -197,13 +197,13 @@
bus_space_read_1(bus_space_tag_t tag, bus_space_handle_t handle,
bus_size_t offset)
{
-#if defined (_I386_BUS_PIO_H_)
-#if defined (_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined (_AMD64_BUS_PIO_H_)
+#if defined (_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
return (inb(handle + offset));
#endif
-#if defined (_I386_BUS_MEMIO_H_)
+#if defined (_AMD64_BUS_MEMIO_H_)
return (*(volatile u_int8_t *)(handle + offset));
#endif
}
@@ -212,13 +212,13 @@
bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t handle,
bus_size_t offset)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
return (inw(handle + offset));
#endif
-#if defined(_I386_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
return (*(volatile u_int16_t *)(handle + offset));
#endif
}
@@ -227,13 +227,13 @@
bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t handle,
bus_size_t offset)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
return (inl(handle + offset));
#endif
-#if defined(_I386_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
return (*(volatile u_int32_t *)(handle + offset));
#endif
}
@@ -265,14 +265,14 @@
bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int8_t *addr, size_t count)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
insb(bsh + offset, addr, count);
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
{
@@ -294,14 +294,14 @@
bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int16_t *addr, size_t count)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
insw(bsh + offset, addr, count);
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
{
@@ -323,14 +323,14 @@
bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int32_t *addr, size_t count)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
insl(bsh + offset, addr, count);
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
{
@@ -377,9 +377,9 @@
bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int8_t *addr, size_t count)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
{
int _port_ = bsh + offset;
@@ -396,8 +396,8 @@
#endif
}
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
{
@@ -419,9 +419,9 @@
bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int16_t *addr, size_t count)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
{
int _port_ = bsh + offset;
@@ -438,8 +438,8 @@
#endif
}
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
{
@@ -461,9 +461,9 @@
bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int32_t *addr, size_t count)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
{
int _port_ = bsh + offset;
@@ -480,8 +480,8 @@
#endif
}
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
{
@@ -524,14 +524,14 @@
bus_space_write_1(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int8_t value)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
outb(bsh + offset, value);
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
*(volatile u_int8_t *)(bsh + offset) = value;
@@ -542,14 +542,14 @@
bus_space_write_2(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int16_t value)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
outw(bsh + offset, value);
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
*(volatile u_int16_t *)(bsh + offset) = value;
@@ -560,14 +560,14 @@
bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, u_int32_t value)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
outl(bsh + offset, value);
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
*(volatile u_int32_t *)(bsh + offset) = value;
@@ -604,14 +604,14 @@
bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, const u_int8_t *addr, size_t count)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
outsb(bsh + offset, addr, count);
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
{
@@ -633,14 +633,14 @@
bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, const u_int16_t *addr, size_t count)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
outsw(bsh + offset, addr, count);
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
{
@@ -662,14 +662,14 @@
bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, const u_int32_t *addr, size_t count)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
outsl(bsh + offset, addr, count);
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
{
@@ -717,9 +717,9 @@
bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, const u_int8_t *addr, size_t count)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
{
int _port_ = bsh + offset;
@@ -736,8 +736,8 @@
#endif
}
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
{
@@ -759,9 +759,9 @@
bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, const u_int16_t *addr, size_t count)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
{
int _port_ = bsh + offset;
@@ -778,8 +778,8 @@
#endif
}
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
{
@@ -801,9 +801,9 @@
bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
bus_size_t offset, const u_int32_t *addr, size_t count)
{
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
{
int _port_ = bsh + offset;
@@ -820,8 +820,8 @@
#endif
}
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
{
@@ -868,15 +868,15 @@
{
bus_space_handle_t addr = bsh + offset;
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
while (count--)
outb(addr, value);
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
while (count--)
@@ -890,15 +890,15 @@
{
bus_space_handle_t addr = bsh + offset;
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
while (count--)
outw(addr, value);
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
while (count--)
@@ -912,15 +912,15 @@
{
bus_space_handle_t addr = bsh + offset;
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
while (count--)
outl(addr, value);
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
while (count--)
@@ -956,15 +956,15 @@
{
bus_space_handle_t addr = bsh + offset;
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
for (; count != 0; count--, addr++)
outb(addr, value);
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
for (; count != 0; count--, addr++)
@@ -978,15 +978,15 @@
{
bus_space_handle_t addr = bsh + offset;
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
for (; count != 0; count--, addr += 2)
outw(addr, value);
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
for (; count != 0; count--, addr += 2)
@@ -1000,15 +1000,15 @@
{
bus_space_handle_t addr = bsh + offset;
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
for (; count != 0; count--, addr += 4)
outl(addr, value);
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
for (; count != 0; count--, addr += 4)
@@ -1051,9 +1051,9 @@
bus_space_handle_t addr1 = bsh1 + off1;
bus_space_handle_t addr2 = bsh2 + off2;
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
{
if (addr1 >= addr2) {
@@ -1068,8 +1068,8 @@
}
}
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
{
@@ -1097,9 +1097,9 @@
bus_space_handle_t addr1 = bsh1 + off1;
bus_space_handle_t addr2 = bsh2 + off2;
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
{
if (addr1 >= addr2) {
@@ -1114,8 +1114,8 @@
}
}
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
{
@@ -1143,9 +1143,9 @@
bus_space_handle_t addr1 = bsh1 + off1;
bus_space_handle_t addr2 = bsh2 + off2;
-#if defined(_I386_BUS_PIO_H_)
-#if defined(_I386_BUS_MEMIO_H_)
- if (tag == I386_BUS_SPACE_IO)
+#if defined(_AMD64_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+ if (tag == AMD64_BUS_SPACE_IO)
#endif
{
if (addr1 >= addr2) {
@@ -1160,8 +1160,8 @@
}
}
#endif
-#if defined(_I386_BUS_MEMIO_H_)
-#if defined(_I386_BUS_PIO_H_)
+#if defined(_AMD64_BUS_MEMIO_H_)
+#if defined(_AMD64_BUS_PIO_H_)
else
#endif
{
@@ -1181,7 +1181,7 @@
#endif
}
-#endif /* defined(_I386_BUS_PIO_H_) || defined(_I386_MEM_IO_H_) */
+#endif /* defined(_AMD64_BUS_PIO_H_) || defined(_AMD64_MEM_IO_H_) */
#if 0 /* Cause a link error for bus_space_copy_8 */
#define bus_space_copy_region_8 !!! bus_space_copy_region_8 unimplemented !!!
@@ -1213,4 +1213,4 @@
#endif
}
-#endif /* _I386_BUS_AT386_H_ */
+#endif /* _AMD64_BUS_AMD64_H_ */
==== //depot/projects/hammer/sys/amd64/include/bus_dma.h#5 (text+ko) ====
@@ -67,10 +67,10 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.18 2003/04/10 23:03:33 mux Exp $ */
+/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.19 2003/05/12 02:44:37 peter Exp $ */
-#ifndef _I386_BUS_DMA_H_
-#define _I386_BUS_DMA_H_
+#ifndef _AMD64_BUS_DMA_H_
+#define _AMD64_BUS_DMA_H_
/*
* Flags used in various bus DMA methods.
@@ -243,4 +243,4 @@
if ((dmamap) != NULL) \
_bus_dmamap_unload(dmat, dmamap)
-#endif /* _I386_BUS_DMA_H_ */
+#endif /* _AMD64_BUS_DMA_H_ */
==== //depot/projects/hammer/sys/amd64/include/bus_memio.h#5 (text+ko) ====
@@ -23,9 +23,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/bus_memio.h,v 1.2 1999/08/28 00:44:08 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/bus_memio.h,v 1.3 2003/05/12 02:44:37 peter Exp $
*/
-#ifndef _I386_BUS_MEMIO_H_
-#define _I386_BUS_MEMIO_H_
-#endif /* _I386_BUS_MEMIO_H_ */
+#ifndef _AMD64_BUS_MEMIO_H_
+#define _AMD64_BUS_MEMIO_H_
+#endif /* _AMD64_BUS_MEMIO_H_ */
==== //depot/projects/hammer/sys/amd64/include/bus_pio.h#5 (text+ko) ====
@@ -23,9 +23,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/bus_pio.h,v 1.2 1999/08/28 00:44:08 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/bus_pio.h,v 1.3 2003/05/12 02:44:37 peter Exp $
*/
-#ifndef _I386_BUS_PIO_H_
-#define _I386_BUS_PIO_H_
-#endif /* _I386_BUS_PIO_H_ */
+#ifndef _AMD64_BUS_PIO_H_
+#define _AMD64_BUS_PIO_H_
+#endif /* _AMD64_BUS_PIO_H_ */
==== //depot/projects/hammer/sys/dev/kbd/atkbdc.c#6 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/kbd/atkbdc.c,v 1.13 2003/05/01 04:19:19 peter Exp $
+ * $FreeBSD: src/sys/dev/kbd/atkbdc.c,v 1.14 2003/05/12 02:44:37 peter Exp $
* from kbdio.c,v 1.13 1998/09/25 11:55:46 yokota Exp
*/
@@ -154,8 +154,10 @@
#endif
/* XXX: tag should be passed from the caller */
-#if defined(__i386__) || defined(__amd64__)
+#if defined(__i386__)
tag = I386_BUS_SPACE_IO;
+#elif defined(__amd64__)
+ tag = AMD64_BUS_SPACE_IO;
#elif defined(__alpha__)
tag = busspace_isa_io;
#elif defined(__ia64__)
More information about the p4-projects
mailing list