Author: marcel
Date: Sun Oct 16 02:43:51 2016
New Revision: 307386
URL: https://svnweb.freebsd.org/changeset/base/307386
Log:
Re-apply change 306811 or alternatively, revert change 307385.
Added:
head/sys/sys/disk/
head/sys/sys/disk/apm.h
- copied, changed from r307385, head/sys/sys/apm.h
head/sys/sys/disk/bsd.h
- copied, changed from r307385, head/sys/sys/disklabel.h
head/sys/sys/disk/gpt.h
- copied, changed from r307385, head/sys/sys/gpt.h
head/sys/sys/disk/mbr.h
- copied, changed from r307385, head/sys/sys/diskmbr.h
head/sys/sys/disk/pc98.h
- copied, changed from r307385, head/sys/sys/diskpc98.h
head/sys/sys/disk/vtoc.h
- copied, changed from r307385, head/sys/sys/vtoc.h
Modified:
head/etc/mtree/BSD.include.dist
head/include/Makefile
head/sys/sys/apm.h
head/sys/sys/disklabel.h
head/sys/sys/diskmbr.h
head/sys/sys/diskpc98.h
head/sys/sys/gpt.h
head/sys/sys/vtoc.h
Modified: head/etc/mtree/BSD.include.dist
==
--- head/etc/mtree/BSD.include.dist Sun Oct 16 02:05:22 2016
(r307385)
+++ head/etc/mtree/BSD.include.dist Sun Oct 16 02:43:51 2016
(r307386)
@@ -336,6 +336,8 @@
ssp
..
sys
+disk
+..
..
teken
..
Modified: head/include/Makefile
==
--- head/include/Makefile Sun Oct 16 02:05:22 2016(r307385)
+++ head/include/Makefile Sun Oct 16 02:43:51 2016(r307386)
@@ -59,6 +59,7 @@ LSUBDIRS= cam/ata cam/nvme cam/scsi \
security/audit \
security/mac_biba security/mac_bsdextended security/mac_lomac \
security/mac_mls security/mac_partition \
+ sys/disk \
ufs/ffs ufs/ufs
LSUBSUBDIRS= dev/mpt/mpilib
Modified: head/sys/sys/apm.h
==
--- head/sys/sys/apm.h Sun Oct 16 02:05:22 2016(r307385)
+++ head/sys/sys/apm.h Sun Oct 16 02:43:51 2016(r307386)
@@ -1,69 +1,5 @@
/*-
- * Copyright (c) 2007 Marcel Moolenaar
- * 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 ``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 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$
+ * This file is in the public domain.
*/
-
-#ifndef _SYS_APM_H_
-#define_SYS_APM_H_
-
-/* Driver Descriptor Record. */
-struct apm_ddr {
- uint16_tddr_sig;
-#defineAPM_DDR_SIG 0x4552
- uint16_tddr_blksize;
- uint32_tddr_blkcount;
-};
-
-#defineAPM_ENT_NAMELEN 32
-#defineAPM_ENT_TYPELEN 32
-
-/* Partition Map Entry Record. */
-struct apm_ent {
- uint16_tent_sig;
-#defineAPM_ENT_SIG 0x504d
- uint16_t_pad_;
- uint32_tent_pmblkcnt;
- uint32_tent_start;
- uint32_tent_size;
- charent_name[APM_ENT_NAMELEN];
- charent_type[APM_ENT_TYPELEN];
-};
-
-#defineAPM_ENT_TYPE_SELF "Apple_partition_map"
-#defineAPM_ENT_TYPE_UNUSED "Apple_Free"
-
-#defineAPM_ENT_TYPE_FREEBSD"FreeBSD"
-#defineAPM_ENT_TYPE_FREEBSD_NANDFS "FreeBSD-nandfs"
-#defineAPM_ENT_TYPE_FREEBSD_SWAP "FreeBSD-swap"
-#defineAPM_ENT_TYPE_FREEBSD_UFS"FreeBSD-UFS"
-#defineAPM_ENT_TYPE_FREEBSD_VINUM "FreeBSD-Vinum"
-#defineAPM_ENT_TYPE_FREEBSD_ZFS"FreeBSD-ZFS"
-
-#defineAPM_ENT_TYPE_APPLE_BOOT "Apple_Bootstrap"
-#defineAPM_ENT_TYPE_APPLE_HFS "Apple_HFS"
-#defineAPM_ENT_TYPE_APPLE_UFS "Apple_UNIX_SVR2"
-
-#endif /* _SYS_APM_H_ */
