change log for rtems (2011-02-17)
rtems-vc at rtems.org
rtems-vc at rtems.org
Thu Feb 17 17:10:24 UTC 2011
*sh*:
2011-02-17 Sebastian Huber <sebastian.huber at embedded-brains.de>
* libblock/include/rtems/bdpart.h (rtems_bdpart_format):
Preserve previous API.
* libblock/src/bdpart-create.c, libblock/src/bdpart-read.c,
libblock/src/bdpart-write.c: Reflect changes above.
* libmisc/shell/fdisk.c: Reflect changes above.
M 1.2716 cpukit/ChangeLog
M 1.5 cpukit/libblock/include/rtems/bdpart.h
M 1.3 cpukit/libblock/src/bdpart-create.c
M 1.3 cpukit/libblock/src/bdpart-read.c
M 1.3 cpukit/libblock/src/bdpart-write.c
M 1.4 cpukit/libmisc/shell/fdisk.c
diff -u rtems/cpukit/ChangeLog:1.2715 rtems/cpukit/ChangeLog:1.2716
--- rtems/cpukit/ChangeLog:1.2715 Thu Feb 17 08:17:08 2011
+++ rtems/cpukit/ChangeLog Thu Feb 17 10:25:42 2011
@@ -1,5 +1,13 @@
2011-02-17 Sebastian Huber <sebastian.huber at embedded-brains.de>
+ * libblock/include/rtems/bdpart.h (rtems_bdpart_format):
+ Preserve previous API.
+ * libblock/src/bdpart-create.c, libblock/src/bdpart-read.c,
+ libblock/src/bdpart-write.c: Reflect changes above.
+ * libmisc/shell/fdisk.c: Reflect changes above.
+
+2011-02-17 Sebastian Huber <sebastian.huber at embedded-brains.de>
+
* libcsupport/src/rtems_heap_extend.c: New file.
* libcsupport/Makefile.am: Reflect change from above.
* libcsupport/include/rtems/malloc.h: Declare rtems_heap_extend().
diff -u rtems/cpukit/libblock/include/rtems/bdpart.h:1.4 rtems/cpukit/libblock/include/rtems/bdpart.h:1.5
--- rtems/cpukit/libblock/include/rtems/bdpart.h:1.4 Thu Feb 10 17:34:58 2011
+++ rtems/cpukit/libblock/include/rtems/bdpart.h Thu Feb 17 10:25:42 2011
@@ -163,41 +163,44 @@
/**
* Disk format description.
*/
-typedef struct {
+typedef union {
/**
* Format type.
*/
rtems_bdpart_format_type type;
- union {
+
+ /**
+ * MBR format fields.
+ */
+ struct {
+ rtems_bdpart_format_type type;
+
+ /**
+ * Disk ID in MBR at offset 440.
+ */
+ uint32_t disk_id;
+
/**
- * MBR format fields.
+ * This option is used for partition table creation and validation checks
+ * before a write to the disk. It ensures that the first primary
+ * partition and the logical partitions start at head one and sector one
+ * under the virtual one head and 63 sectors geometry. Each begin and
+ * end of a partition will be aligned to the virtual cylinder boundary.
*/
- struct {
- /**
- * Disk ID in MBR at offset 440.
- */
- uint32_t disk_id;
-
- /**
- * This option is used for partition table creation and validation checks
- * before a write to the disk. It ensures that the first primary
- * partition and the logical partitions start at head one and sector one
- * under the virtual one head and 63 sectors geometry. Each begin and
- * end of a partition will be aligned to the virtual cylinder boundary.
- */
- bool dos_compatibility;
- } mbr;
+ bool dos_compatibility;
+ } mbr;
+
+ /**
+ * GPT format fields.
+ */
+ struct {
+ rtems_bdpart_format_type type;
/**
- * GPT format fields.
+ * Disk ID in GPT header.
*/
- struct {
- /**
- * Disk ID in GPT header.
- */
- uuid_t disk_id;
- } gpt;
- } u;
+ uuid_t disk_id;
+ } gpt;
} rtems_bdpart_format;
/**
diff -u rtems/cpukit/libblock/src/bdpart-create.c:1.2 rtems/cpukit/libblock/src/bdpart-create.c:1.3
--- rtems/cpukit/libblock/src/bdpart-create.c:1.2 Thu Feb 10 17:34:58 2011
+++ rtems/cpukit/libblock/src/bdpart-create.c Thu Feb 17 10:25:42 2011
@@ -37,7 +37,7 @@
rtems_status_code sc = RTEMS_SUCCESSFUL;
bool dos_compatibility = format != NULL
&& format->type == RTEMS_BDPART_FORMAT_MBR
- && format->u.mbr.dos_compatibility;
+ && format->mbr.dos_compatibility;
rtems_blkdev_bnum disk_end = 0;
rtems_blkdev_bnum pos = 0;
rtems_blkdev_bnum dist_sum = 0;
diff -u rtems/cpukit/libblock/src/bdpart-read.c:1.2 rtems/cpukit/libblock/src/bdpart-read.c:1.3
--- rtems/cpukit/libblock/src/bdpart-read.c:1.2 Thu Feb 10 17:34:58 2011
+++ rtems/cpukit/libblock/src/bdpart-read.c Thu Feb 17 10:25:42 2011
@@ -261,10 +261,10 @@
/* Set format */
format->type = RTEMS_BDPART_FORMAT_MBR;
- format->u.mbr.disk_id = rtems_uint32_from_little_endian(
+ format->mbr.disk_id = rtems_uint32_from_little_endian(
block->buffer + RTEMS_BDPART_MBR_OFFSET_DISK_ID
);
- format->u.mbr.dos_compatibility = true;
+ format->mbr.dos_compatibility = true;
/* Iterate through the rest of the primary partition table */
for (i = 1; i < 4; ++i) {
diff -u rtems/cpukit/libblock/src/bdpart-write.c:1.2 rtems/cpukit/libblock/src/bdpart-write.c:1.3
--- rtems/cpukit/libblock/src/bdpart-write.c:1.2 Thu Feb 10 17:34:58 2011
+++ rtems/cpukit/libblock/src/bdpart-write.c Thu Feb 17 10:25:43 2011
@@ -94,7 +94,7 @@
rtems_status_code esc = RTEMS_SUCCESSFUL;
bool dos_compatibility = format != NULL
&& format->type == RTEMS_BDPART_FORMAT_MBR
- && format->u.mbr.dos_compatibility;
+ && format->mbr.dos_compatibility;
rtems_bdbuf_buffer *block = NULL;
rtems_blkdev_bnum disk_end = 0;
rtems_blkdev_bnum record_space =
@@ -219,7 +219,7 @@
/* Write disk ID */
rtems_uint32_to_little_endian(
- format->u.mbr.disk_id,
+ format->mbr.disk_id,
block->buffer + RTEMS_BDPART_MBR_OFFSET_DISK_ID
);
diff -u rtems/cpukit/libmisc/shell/fdisk.c:1.3 rtems/cpukit/libmisc/shell/fdisk.c:1.4
--- rtems/cpukit/libmisc/shell/fdisk.c:1.3 Thu Feb 10 18:05:29 2011
+++ rtems/cpukit/libmisc/shell/fdisk.c Thu Feb 17 10:25:42 2011
@@ -132,8 +132,8 @@
/* Default format */
format.type = RTEMS_BDPART_FORMAT_MBR;
- format.u.mbr.disk_id = 0;
- format.u.mbr.dos_compatibility = true;
+ format.mbr.disk_id = 0;
+ format.mbr.dos_compatibility = true;
for (ai = 2; ai < argc; ++ai) {
char *s = argv [ai];
@@ -194,9 +194,9 @@
break;
case RTEMS_BDPART_SHELL_MBR:
if (strcmp( s, "dos") == 0) {
- format.u.mbr.dos_compatibility = true;
+ format.mbr.dos_compatibility = true;
} else if (strcmp( s, "nodos") == 0) {
- format.u.mbr.dos_compatibility = false;
+ format.mbr.dos_compatibility = false;
} else {
RTEMS_BDPART_SHELL_ERROR( "unexpected option: %s", argv [ai]);
}
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110217/a62a6c14/attachment-0001.html>
More information about the vc
mailing list