summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorcognet <cognet@FreeBSD.org>2006-01-25 11:24:37 +0000
committercognet <cognet@FreeBSD.org>2006-01-25 11:24:37 +0000
commitb52efc57bec49fd584f1580087664aff15a10168 (patch)
tree2f71861e5e8725a2e794ae42c9b721940854c1d0 /lib
parent7d855a2e46aeec9c98d741ed78758d4f5c112b41 (diff)
downloadFreeBSD-src-b52efc57bec49fd584f1580087664aff15a10168.zip
FreeBSD-src-b52efc57bec49fd584f1580087664aff15a10168.tar.gz
Add a dummy arm Write_Disk() function, and compile libdisk on arm.
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile6
-rw-r--r--lib/libdisk/disk.c2
-rw-r--r--lib/libdisk/libdisk.h3
-rw-r--r--lib/libdisk/write_arm_disk.c47
4 files changed, 52 insertions, 6 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 8dfa3b4..e30b774 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -26,7 +26,7 @@ SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \
libnetgraph libradius librpcsvc libsbuf libtacplus libutil \
${_libypclnt} libalias libarchive ${_libatm} \
libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \
- libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \
+ libcalendar libcam libcompat libdevinfo libdevstat libdisk \
libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \
libgssapi ${_libio} libipsec \
libipx libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \
@@ -68,10 +68,6 @@ _libvgl= libvgl
_libc_r=
.endif
-.if ${MACHINE_ARCH} != "arm"
-_libdisk= libdisk
-.endif
-
.if ${MACHINE_ARCH} == "alpha"
_libio= libio
.endif
diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c
index 4f21cad..7170d4b 100644
--- a/lib/libdisk/disk.c
+++ b/lib/libdisk/disk.c
@@ -50,6 +50,8 @@ const enum platform platform =
p_ppc
#elif defined(__amd64__)
p_amd64
+#elif defined(__arm__)
+ p_arm
#else
IHAVENOIDEA
#endif
diff --git a/lib/libdisk/libdisk.h b/lib/libdisk/libdisk.h
index 36866ed..0a161cc 100644
--- a/lib/libdisk/libdisk.h
+++ b/lib/libdisk/libdisk.h
@@ -28,7 +28,8 @@ enum platform {
p_sparc64,
p_ia64,
p_ppc,
- p_amd64
+ p_amd64,
+ p_arm
};
extern const enum platform platform;
diff --git a/lib/libdisk/write_arm_disk.c b/lib/libdisk/write_arm_disk.c
new file mode 100644
index 0000000..5dbb0ad
--- /dev/null
+++ b/lib/libdisk/write_arm_disk.c
@@ -0,0 +1,47 @@
+/*-
+ * Copyright (c) 2006 Olivier Houchard
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+#include <err.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/disklabel.h>
+#include <paths.h>
+#include "libdisk.h"
+
+int
+Write_Disk(const struct disk *d1)
+{
+ return (0);
+}
OpenPOWER on IntegriCloud