CVS: blob/src/blob badge4.c,1.14,1.15

[Christopher H. <ch...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory sc8-pr-cvs1:/tmp/cvs-serv19804

Modified Files:
	badge4.c 
Log Message:
Use new initializers.


Index: badge4.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/badge4.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- badge4.c	27 Jan 2003 20:49:06 -0000	1.14
+++ badge4.c	28 Jan 2003 03:41:28 -0000	1.15
@@ -41,18 +41,18 @@
 #define DEBUG
 
 static struct i2c_bus_gpio_private badge4_i2c_bus_gpio_private = {
-	sda_gpio: BADGE4_GPIO_SDSDA,
-	scl_gpio: BADGE4_GPIO_SDSCL,
-	delay: 100
+	.sda_gpio= BADGE4_GPIO_SDSDA,
+	.scl_gpio= BADGE4_GPIO_SDSCL,
+	.delay= 100
 };
 
 static struct i2c_bus badge4_i2c_bus = {
-	init_bus: init_bus_gpio,
-	set_sda: set_sda_gpio,
-	get_sda: get_sda_gpio,
-	set_scl: set_scl_gpio,
-	get_scl: get_scl_gpio,
-	private: &badge4_i2c_bus_gpio_private
+	.init_bus= init_bus_gpio,
+	.set_sda= set_sda_gpio,
+	.get_sda= get_sda_gpio,
+	.set_scl= set_scl_gpio,
+	.get_scl= get_scl_gpio,
+	.private= &badge4_i2c_bus_gpio_private
 };
 
 /* flash descriptors for BadgePAD 4 flash */
@@ -64,52 +64,54 @@
 static blob_partition_t badge4_default_partition_table[] = {
 	{
 		/* start of table */
-		magic:		BLOB_DEFAULT_PART_TABLE_MAGIC,
-		next:		sizeof(blob_partition_t),
-		offset:		0x00000000,	/* absolute base address */
-		size:		BLOB_PART_SIZ_FULL
+		.magic=		BLOB_DEFAULT_PART_TABLE_MAGIC,
+		.next=		sizeof(blob_partition_t),
+		.offset=	0x00000000,	/* absolute base address */
+		.size=		BLOB_PART_SIZ_FULL
 	},
 	{
 		/* blob itself */
-		magic:		BLOB_PART_VALID_MAGIC,
-		next:		sizeof(blob_partition_t),
-		offset:		BLOB_PART_OFS_APPEND,
-		size:		BLOB_FLASH_LEN,
-		name:		"blob",
-		mem_base:	BLOB_RAM_BASE
+		.magic=		BLOB_PART_VALID_MAGIC,
+		.next=		sizeof(blob_partition_t),
+		.offset=	BLOB_PART_OFS_APPEND,
+		.size=		BLOB_FLASH_LEN,
+		.name=		"blob",
+		.mem_base=	BLOB_RAM_BASE
 	},
 	{
 		/* parameter block */
-		magic:		BLOB_PART_VALID_MAGIC,
-		next:		sizeof(blob_partition_t),
-		offset:		BLOB_PART_OFS_APPEND,
-		size:		PARAM_FLASH_LEN,
-		name:		"parameters",
+		.magic=		BLOB_PART_VALID_MAGIC,
+		.next=		sizeof(blob_partition_t),
+		.offset=	BLOB_PART_OFS_APPEND,
+		.size=		PARAM_FLASH_LEN,
+		.name=		"param",
+		.flags=		BLOB_PART_FLAG_PTABLE
 	},
 #ifdef CONFIG_ZIMAGE_SUPPORT
 	{
 		/* parameter block */
-		magic:		BLOB_PART_VALID_MAGIC,
-		next:		sizeof(blob_partition_t),
-		offset:		BLOB_PART_OFS_APPEND,
-		size:		KERNEL_FLASH_LEN,
-		name:		"kernel",
-		flags:		BLOB_PART_FLAG_EXEC
+		.magic=		BLOB_PART_VALID_MAGIC,
+		.next=		sizeof(blob_partition_t),
+		.offset=	BLOB_PART_OFS_APPEND,
+		.size=		KERNEL_FLASH_LEN,
+		.name=		"kernel",
+		.flags=		BLOB_PART_FLAG_EXEC,
+		.mem_base=	KERNEL_RAM_BASE,
+		.entry_point=	KERNEL_RAM_BASE
 	},
 #endif
 	{
 		/* root */
-		magic:		BLOB_PART_VALID_MAGIC,
-		next:		sizeof(blob_partition_t),
-		offset:		BLOB_PART_OFS_APPEND,
-		size:		BLOB_PART_SIZ_FULL,
-		name:		"root",
-		flags:		BLOB_PART_FLAG_JFFS2
+		.magic=		BLOB_PART_VALID_MAGIC,
+		.next=		sizeof(blob_partition_t),
+		.offset=	BLOB_PART_OFS_APPEND,
+		.size=		BLOB_PART_SIZ_FULL,
+		.name=		"ramdisk", /* not really */
+		.flags=		BLOB_PART_FLAG_JFFS2
 	},
 	{
 		/* last entry */
-#define PART_LAST (PART_ROOT + 1)
-		magic:		BLOB_PART_LAST_MAGIC
+		.magic=		BLOB_PART_LAST_MAGIC
 	}
 };