Date: Sun, 24 Apr 2011 17:28:27 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r220996 - projects/altix/sys/ia64/include Message-ID: <201104241728.p3OHSRMF040768@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Sun Apr 24 17:28:27 2011 New Revision: 220996 URL: http://svn.freebsd.org/changeset/base/220996 Log: We now have 8-byte wide bus-space accesses. Consequently, the lack of 8-byte wide I/O port access support was causing build breakages. Just drop support for 8-byte wide I/O port accesses. Modified: projects/altix/sys/ia64/include/bus.h Modified: projects/altix/sys/ia64/include/bus.h ============================================================================== --- projects/altix/sys/ia64/include/bus.h Sun Apr 24 17:25:50 2011 (r220995) +++ projects/altix/sys/ia64/include/bus.h Sun Apr 24 17:28:27 2011 (r220996) @@ -222,9 +222,8 @@ bus_space_read_8(bus_space_tag_t bst, bu { uint64_t val; - val = (__predict_false(bst == IA64_BUS_SPACE_IO)) - ? bus_space_read_io_8(bsh + ofs) - : ia64_ld8((void *)(bsh + ofs)); + val = (__predict_false(bst == IA64_BUS_SPACE_IO)) ? ~0 : + ia64_ld8((void *)(bsh + ofs)); return (val); } @@ -277,9 +276,7 @@ bus_space_write_8(bus_space_tag_t bst, b uint64_t val) { - if (__predict_false(bst == IA64_BUS_SPACE_IO)) - bus_space_write_io_8(bsh + ofs, val); - else + if (__predict_true(bst != IA64_BUS_SPACE_IO)) ia64_st8((void *)(bsh + ofs), val); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104241728.p3OHSRMF040768>