diff options
| author | Pedro Martelletto <pedro@cvs.openbsd.org> | 2006-06-22 00:10:02 +0000 |
|---|---|---|
| committer | Pedro Martelletto <pedro@cvs.openbsd.org> | 2006-06-22 00:10:02 +0000 |
| commit | 671fff6b4206ff995773f6d9c531d12098def96d (patch) | |
| tree | 6a94ba6d84c265bffa6e1b5e4deb740d04ba8a49 /sys/isofs/udf/ecma167-udf.h | |
| parent | b7efbe1e6fc638b4341f2344aa371add34340236 (diff) | |
Make udf_find_partmaps() correctly spot virtual partition maps in
medias that have it, testing jmc@ and myself.
Diffstat (limited to 'sys/isofs/udf/ecma167-udf.h')
| -rw-r--r-- | sys/isofs/udf/ecma167-udf.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/isofs/udf/ecma167-udf.h b/sys/isofs/udf/ecma167-udf.h index 720e69ec540..f4538261173 100644 --- a/sys/isofs/udf/ecma167-udf.h +++ b/sys/isofs/udf/ecma167-udf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ecma167-udf.h,v 1.3 2006/01/19 01:05:32 pedro Exp $ */ +/* $OpenBSD: ecma167-udf.h,v 1.4 2006/06/22 00:10:01 pedro Exp $ */ /* * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org> @@ -203,8 +203,6 @@ struct logvol_desc { uint8_t maps[1]; } __packed; -#define UDF_PMAP_SIZE 64 - /* Type 1 Partition Map [3/10.7.2] */ struct part_map_1 { uint8_t type; @@ -213,6 +211,8 @@ struct part_map_1 { uint16_t part_num; } __packed; +#define UDF_PMAP_TYPE1_SIZE 6 + /* Type 2 Partition Map [3/10.7.3] */ struct part_map_2 { uint8_t type; @@ -220,6 +220,8 @@ struct part_map_2 { uint8_t part_id[62]; } __packed; +#define UDF_PMAP_TYPE2_SIZE 64 + /* Virtual Partition Map [UDF 2.01/2.2.8] */ struct part_map_virt { uint8_t type; @@ -247,7 +249,6 @@ struct part_map_spare { } __packed; union udf_pmap { - uint8_t data[UDF_PMAP_SIZE]; struct part_map_1 pm1; struct part_map_2 pm2; struct part_map_virt pmv; |