Use explicit initializer style, fill in missing functions as unimplemented.

1 files changed, 79 insertions, 43 deletions

diff --git a/sys/arm/xscale/pxa/pxa_space.c b/sys/arm/xscale/pxa/pxa_space.c
index 7a9160a..35b6cd9 100644
--- a/sys/arm/xscale/pxa/pxa_space.c
+++ b/sys/arm/xscale/pxa/pxa_space.c
@@ -65,73 +65,109 @@ bs_protos(pxa);
  */
 struct bus_space _base_tag = {
 	/* cookie */
-	(void *) 0,
+	.bs_privdata	= NULL,
 
 	/* mapping/unmapping */
-	generic_bs_map,
-	generic_bs_unmap,
-	generic_bs_subregion,
+	.bs_map		= generic_bs_map,
+	.bs_unmap	= generic_bs_unmap,
+	.bs_subregion	= generic_bs_subregion,
 
 	/* allocation/deallocation */
-	generic_bs_alloc,
-	generic_bs_free,
+	.bs_alloc	= generic_bs_alloc,
+	.bs_free	= generic_bs_free,
 
 	/* barrier */
-	generic_bs_barrier,
+	.bs_barrier	= generic_bs_barrier,
 
 	/* read (single) */
-	pxa_bs_r_1,
-	pxa_bs_r_2,
-	pxa_bs_r_4,
-	NULL,
+	.bs_r_1		= pxa_bs_r_1,
+	.bs_r_2		= pxa_bs_r_2,
+	.bs_r_4		= pxa_bs_r_4,
+	.bs_r_8		= BS_UNIMPLEMENTED,
 
 	/* read multiple */
-	pxa_bs_rm_1,
-	pxa_bs_rm_2,
-	NULL,
-	NULL,
+	.bs_rm_1	= pxa_bs_rm_1,
+	.bs_rm_2	= pxa_bs_rm_2,
+	.bs_rm_4	= BS_UNIMPLEMENTED,
+	.bs_rm_8	= BS_UNIMPLEMENTED,
 
 	/* read region */
-	pxa_bs_rr_1,
-	NULL,
-	NULL,
-	NULL,
+	.bs_rr_1	= pxa_bs_rr_1,
+	.bs_rr_2	= BS_UNIMPLEMENTED,
+	.bs_rr_4	= BS_UNIMPLEMENTED,
+	.bs_rr_8	= BS_UNIMPLEMENTED,
 
 	/* write (single) */
-	pxa_bs_w_1,
-	pxa_bs_w_2,
-	pxa_bs_w_4,
-	NULL,
+	.bs_w_1		= pxa_bs_w_1,
+	.bs_w_2		= pxa_bs_w_2,
+	.bs_w_4		= pxa_bs_w_4,
+	.bs_w_8		= BS_UNIMPLEMENTED,
 
 	/* write multiple */
-	pxa_bs_wm_1,
-	pxa_bs_wm_2,
-	NULL,
-	NULL,
+	.bs_wm_1	= pxa_bs_wm_1,
+	.bs_wm_2	= pxa_bs_wm_2,
+	.bs_wm_4	= BS_UNIMPLEMENTED,
+	.bs_wm_8	= BS_UNIMPLEMENTED,
 
 	/* write region */
-	NULL,
-	NULL,
-	NULL,
-	NULL,
+	.bs_wr_1	= BS_UNIMPLEMENTED,
+	.bs_wr_2	= BS_UNIMPLEMENTED,
+	.bs_wr_4	= BS_UNIMPLEMENTED,
+	.bs_wr_8	= BS_UNIMPLEMENTED,
 
 	/* set multiple */
-	NULL,
-	NULL,
-	NULL,
-	NULL,
+	.bs_sm_1	= BS_UNIMPLEMENTED,
+	.bs_sm_2	= BS_UNIMPLEMENTED,
+	.bs_sm_4	= BS_UNIMPLEMENTED,
+	.bs_sm_8	= BS_UNIMPLEMENTED,
 
 	/* set region */
-	NULL,
-	NULL,
-	NULL,
-	NULL,
+	.bs_sr_1	= BS_UNIMPLEMENTED,
+	.bs_sr_2	= BS_UNIMPLEMENTED,
+	.bs_sr_4	= BS_UNIMPLEMENTED,
+	.bs_sr_8	= BS_UNIMPLEMENTED,
 
 	/* copy */
-	NULL,
-	NULL,
-	NULL,
-	NULL,
+	.bs_c_1		= BS_UNIMPLEMENTED,
+	.bs_c_2		= BS_UNIMPLEMENTED,
+	.bs_c_4		= BS_UNIMPLEMENTED,
+	.bs_c_8		= BS_UNIMPLEMENTED,
+
+	/* read stream (single) */
+	.bs_r_1_s	= BS_UNIMPLEMENTED,
+	.bs_r_2_s	= BS_UNIMPLEMENTED,
+	.bs_r_4_s	= BS_UNIMPLEMENTED,
+	.bs_r_8_s	= BS_UNIMPLEMENTED,
+
+	/* read multiple stream */
+	.bs_rm_1_s	= BS_UNIMPLEMENTED,
+	.bs_rm_2_s	= BS_UNIMPLEMENTED,
+	.bs_rm_4_s	= BS_UNIMPLEMENTED,
+	.bs_rm_8_s	= BS_UNIMPLEMENTED,
+
+	/* read region stream */
+	.bs_rr_1_s	= BS_UNIMPLEMENTED,
+	.bs_rr_2_s	= BS_UNIMPLEMENTED,
+	.bs_rr_4_s	= BS_UNIMPLEMENTED,
+	.bs_rr_8_s	= BS_UNIMPLEMENTED,
+
+	/* write stream (single) */
+	.bs_w_1_s	= BS_UNIMPLEMENTED, 
+	.bs_w_2_s	= BS_UNIMPLEMENTED, 
+	.bs_w_4_s	= BS_UNIMPLEMENTED, 
+	.bs_w_8_s	= BS_UNIMPLEMENTED, 
+
+	/* write multiple stream */
+	.bs_wm_1_s	= BS_UNIMPLEMENTED,
+	.bs_wm_2_s	= BS_UNIMPLEMENTED,
+	.bs_wm_4_s	= BS_UNIMPLEMENTED,
+	.bs_wm_8_s	= BS_UNIMPLEMENTED,
+
+	/* write region stream */
+	.bs_wr_1_s	= BS_UNIMPLEMENTED,
+	.bs_wr_2_s	= BS_UNIMPLEMENTED,
+	.bs_wr_4_s	= BS_UNIMPLEMENTED,
+	.bs_wr_8_s	= BS_UNIMPLEMENTED,
 };
 
 static struct bus_space	_obio_tag;