From owner-p4-projects@FreeBSD.ORG Thu Jul 6 11:40:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7779916A4DD; Thu, 6 Jul 2006 11:40:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 32F9116A4DA for ; Thu, 6 Jul 2006 11:40:09 +0000 (UTC) (envelope-from wkoszek@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C679C43D49 for ; Thu, 6 Jul 2006 11:40:08 +0000 (GMT) (envelope-from wkoszek@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66Be8Yi067297 for ; Thu, 6 Jul 2006 11:40:08 GMT (envelope-from wkoszek@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66Be8Wc067294 for perforce@freebsd.org; Thu, 6 Jul 2006 11:40:08 GMT (envelope-from wkoszek@FreeBSD.org) Date: Thu, 6 Jul 2006 11:40:08 GMT Message-Id: <200607061140.k66Be8Wc067294@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wkoszek@FreeBSD.org using -f From: "Wojciech A. Koszek" To: Perforce Change Reviews Cc: Subject: PERFORCE change 100726 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 11:40:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=100726 Change 100726 by wkoszek@wkoszek_laptop on 2006/07/06 11:39:40 Disable stuff, which won't work on MIPS for sure. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/bus.h#2 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/bus.h#2 (text+ko) ==== @@ -167,7 +167,6 @@ bus_size_t offset, bus_size_t size __unused, bus_space_handle_t *nbshp) { - *nbshp = bsh + offset; return (0); } @@ -215,30 +214,36 @@ bus_space_read_1(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { - +#if 0 if (tag == AMD64_BUS_SPACE_IO) return (inb(handle + offset)); return (*(volatile u_int8_t *)(handle + offset)); +#endif + return (0); } static __inline u_int16_t bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { - +#if 0 if (tag == AMD64_BUS_SPACE_IO) return (inw(handle + offset)); return (*(volatile u_int16_t *)(handle + offset)); +#endif + return (0); } static __inline u_int32_t bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { - +#if 0 if (tag == AMD64_BUS_SPACE_IO) return (inl(handle + offset)); return (*(volatile u_int32_t *)(handle + offset)); +#endif + return (0); } #if 0 /* Cause a link error for bus_space_read_8 */ @@ -268,7 +273,7 @@ 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 0 if (tag == AMD64_BUS_SPACE_IO) insb(bsh + offset, addr, count); else { @@ -283,13 +288,14 @@ "%eax", "memory"); #endif } +#endif } static __inline void 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 0 if (tag == AMD64_BUS_SPACE_IO) insw(bsh + offset, addr, count); else { @@ -304,13 +310,14 @@ "%eax", "memory"); #endif } +#endif } static __inline void 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 0 if (tag == AMD64_BUS_SPACE_IO) insl(bsh + offset, addr, count); else { @@ -325,6 +332,7 @@ "%eax", "memory"); #endif } +#endif } #if 0 /* Cause a link error for bus_space_read_multi_8 */ @@ -356,7 +364,7 @@ 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 0 if (tag == AMD64_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM @@ -382,13 +390,14 @@ "memory", "cc"); #endif } +#endif } static __inline void 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 0 if (tag == AMD64_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM @@ -414,13 +423,14 @@ "memory", "cc"); #endif } +#endif } static __inline void 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 0 if (tag == AMD64_BUS_SPACE_IO) { int _port_ = bsh + offset; #ifdef __GNUCLIKE_ASM @@ -446,6 +456,7 @@ "memory", "cc"); #endif } +#endif } #if 0 /* Cause a link error for bus_space_read_region_8 */ @@ -473,33 +484,36 @@ bus_space_write_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t value) { - +#if 0 if (tag == AMD64_BUS_SPACE_IO) outb(bsh + offset, value); else *(volatile u_int8_t *)(bsh + offset) = value; +#endif } static __inline void bus_space_write_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t value) { - +#if 0 if (tag == AMD64_BUS_SPACE_IO) outw(bsh + offset, value); else *(volatile u_int16_t *)(bsh + offset) = value; +#endif } static __inline void bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t value) { - +#if 0 if (tag == AMD64_BUS_SPACE_IO) outl(bsh + offset, value); else *(volatile u_int32_t *)(bsh + offset) = value; +#endif } #if 0 /* Cause a link error for bus_space_write_8 */ @@ -532,7 +546,7 @@ 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 0 if (tag == AMD64_BUS_SPACE_IO) outsb(bsh + offset, addr, count); else { @@ -547,13 +561,14 @@ "%eax", "memory", "cc"); #endif } +#endif } static __inline void 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 0 if (tag == AMD64_BUS_SPACE_IO) outsw(bsh + offset, addr, count); else { @@ -568,12 +583,14 @@ "%eax", "memory", "cc"); #endif } +#endif } static __inline void 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 0 if (tag == AMD64_BUS_SPACE_IO) outsl(bsh + offset, addr, count); @@ -589,6 +606,7 @@ "%eax", "memory", "cc"); #endif } +#endif } #if 0 /* Cause a link error for bus_space_write_multi_8 */ @@ -621,6 +639,7 @@ 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 0 if (tag == AMD64_BUS_SPACE_IO) { int _port_ = bsh + offset; @@ -647,12 +666,14 @@ "memory", "cc"); #endif } +#endif } static __inline void 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 0 if (tag == AMD64_BUS_SPACE_IO) { int _port_ = bsh + offset; @@ -679,12 +700,14 @@ "memory", "cc"); #endif } +#endif } static __inline void 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 0 if (tag == AMD64_BUS_SPACE_IO) { int _port_ = bsh + offset; @@ -711,6 +734,7 @@ "memory", "cc"); #endif } +#endif } #if 0 /* Cause a link error for bus_space_write_region_8 */ @@ -740,6 +764,7 @@ bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t value, size_t count) { +#if 0 bus_space_handle_t addr = bsh + offset; if (tag == AMD64_BUS_SPACE_IO) @@ -748,12 +773,14 @@ else while (count--) *(volatile u_int8_t *)(addr) = value; +#endif } static __inline void bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t value, size_t count) { +#if 0 bus_space_handle_t addr = bsh + offset; if (tag == AMD64_BUS_SPACE_IO) @@ -762,12 +789,14 @@ else while (count--) *(volatile u_int16_t *)(addr) = value; +#endif } static __inline void bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t value, size_t count) { +#if 0 bus_space_handle_t addr = bsh + offset; if (tag == AMD64_BUS_SPACE_IO) @@ -776,6 +805,7 @@ else while (count--) *(volatile u_int32_t *)(addr) = value; +#endif } #if 0 /* Cause a link error for bus_space_set_multi_8 */ @@ -804,6 +834,7 @@ bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t value, size_t count) { +#if 0 bus_space_handle_t addr = bsh + offset; if (tag == AMD64_BUS_SPACE_IO) @@ -812,12 +843,14 @@ else for (; count != 0; count--, addr++) *(volatile u_int8_t *)(addr) = value; +#endif } static __inline void bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t value, size_t count) { +#if 0 bus_space_handle_t addr = bsh + offset; if (tag == AMD64_BUS_SPACE_IO) @@ -826,12 +859,14 @@ else for (; count != 0; count--, addr += 2) *(volatile u_int16_t *)(addr) = value; +#endif } static __inline void bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t value, size_t count) { +#if 0 bus_space_handle_t addr = bsh + offset; if (tag == AMD64_BUS_SPACE_IO) @@ -840,6 +875,7 @@ else for (; count != 0; count--, addr += 4) *(volatile u_int32_t *)(addr) = value; +#endif } #if 0 /* Cause a link error for bus_space_set_region_8 */ @@ -874,6 +910,7 @@ bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, size_t count) { +#if 0 bus_space_handle_t addr1 = bsh1 + off1; bus_space_handle_t addr2 = bsh2 + off2; @@ -902,6 +939,7 @@ *(volatile u_int8_t *)(addr1); } } +#endif } static __inline void @@ -909,6 +947,7 @@ bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, size_t count) { +#if 0 bus_space_handle_t addr1 = bsh1 + off1; bus_space_handle_t addr2 = bsh2 + off2; @@ -937,6 +976,7 @@ *(volatile u_int16_t *)(addr1); } } +#endif } static __inline void @@ -944,6 +984,7 @@ bus_size_t off1, bus_space_handle_t bsh2, bus_size_t off2, size_t count) { +#if 0 bus_space_handle_t addr1 = bsh1 + off1; bus_space_handle_t addr2 = bsh2 + off2; @@ -972,6 +1013,7 @@ *(volatile u_int32_t *)(addr1); } } +#endif } #if 0 /* Cause a link error for bus_space_copy_8 */ @@ -996,12 +1038,14 @@ bus_space_barrier(bus_space_tag_t tag __unused, bus_space_handle_t bsh __unused, bus_size_t offset __unused, bus_size_t len __unused, int flags) { +#if 0 #ifdef __GNUCLIKE_ASM if (flags & BUS_SPACE_BARRIER_READ) __asm __volatile("lock; addl $0,0(%%rsp)" : : : "memory"); else __asm __volatile("" : : : "memory"); #endif +#endif } #ifdef BUS_SPACE_NO_LEGACY