Index: head/sys/boot/ofw/libofw/ofw_copy.c =================================================================== --- head/sys/boot/ofw/libofw/ofw_copy.c (revision 84619) +++ head/sys/boot/ofw/libofw/ofw_copy.c (revision 84620) @@ -1,84 +1,84 @@ /*- * Copyright (c) 1998 Michael Smith * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (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$ */ /* * MD primitives supporting placement of module data * * XXX should check load address/size against memory top. */ #include #include "libofw.h" #define READIN_BUF (4 * 1024) ssize_t ofw_copyin(const void *src, vm_offset_t dest, const size_t len) { - bcopy(src, (void *)dest, len); - return(len); + bcopy(src, (void *)dest, len); + return(len); } ssize_t ofw_copyout(const vm_offset_t src, void *dest, const size_t len) { - bcopy((void *)src, dest, len); - return(len); + bcopy((void *)src, dest, len); + return(len); } ssize_t ofw_readin(const int fd, vm_offset_t dest, const size_t len) { void *buf; size_t resid, chunk, get; ssize_t got; vm_offset_t p; p = dest; chunk = min(READIN_BUF, len); buf = malloc(chunk); if (buf == NULL) { printf("ofw_readin: buf malloc failed\n"); return(0); } for (resid = len; resid > 0; resid -= got, p += got) { get = min(chunk, resid); got = read(fd, buf, get); if (got <= 0) { printf("ofw_readin: read failed\n"); break; } bcopy(buf, (void *)p, got); } free(buf); return(len - resid); } Index: head/sys/boot/ofw/libofw/ofw_time.c =================================================================== --- head/sys/boot/ofw/libofw/ofw_time.c (revision 84619) +++ head/sys/boot/ofw/libofw/ofw_time.c (revision 84620) @@ -1,61 +1,60 @@ /* * Copyright (c) 2000 Benno Rice * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY Benno Rice ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (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$ */ #include #include "openfirm.h" time_t time(time_t *tloc) { int secs; secs = OF_milliseconds() / 1000; if (tloc) *tloc = secs; return secs; } int getsecs() { time_t n = 0; time(&n); return n; } void delay(int usecs) { int msecs, start; msecs = usecs / 1000; start = OF_milliseconds(); while (OF_milliseconds() - start < msecs); } -