OSDN > Find Software > System > Embedded systems > ChibiOS > SCM > SVN > Commit

ChibiOS Donation

chibios: Commit

Fixed regression in the demo.

--- trunk/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_DYNAMIC/main.c (revision 15625)

+++ trunk/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_DYNAMIC/main.c (revision 15626)

		@@ -65,10 +65,12 @@
65	65	.regions = {
66	66	[0] = {
67	67	.area = {STARTUP_FLASH1_BASE, STARTUP_FLASH1_SIZE},
	68	+ .used = true,
68	69	.writeable = false
69	70	},
70	71	[1] = {
71	72	.area = {STARTUP_RAM1_BASE, STARTUP_RAM1_SIZE},
	73	+ .used = true,
72	74	.writeable = true
73	75	}
74	76	},

		@@ -95,10 +97,12 @@
95	97	.regions = {
96	98	[0] = {
97	99	.area = {STARTUP_FLASH2_BASE, STARTUP_FLASH2_SIZE},
	100	+ .used = true,
98	101	.writeable = false
99	102	},
100	103	[1] = {
101	104	.area = {STARTUP_RAM2_BASE, STARTUP_RAM2_SIZE},
	105	+ .used = true,
102	106	.writeable = true
103	107	}
104	108	},

		@@ -215,7 +237,7 @@
215	237	/* Starting sandboxed thread 1.*/
216	238	utp1 = sbStartThread(&sbx1, "sbx1",
217	239	waUnprivileged1, sizeof (waUnprivileged1),
218		- NORMALPRIO - 1, NULL, NULL);
	240	+ NORMALPRIO - 1, sbx1_argv, sbx1_envp);
219	241	if (utp1 == NULL) {
220	242	chSysHalt("sbx1 failed");
221	243	}

		@@ -223,7 +245,7 @@
223	245	/* Starting sandboxed thread 2.*/
224	246	utp2 = sbStartThread(&sbx2, "sbx2",
225	247	waUnprivileged2, sizeof (waUnprivileged2),
226		- NORMALPRIO - 1, NULL, NULL);
	248	+ NORMALPRIO - 1, sbx2_argv, sbx2_envp);
227	249	if (utp1 == NULL) {
228	250	chSysHalt("sbx2 failed");
229	251	}

--- trunk/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/main.c (revision 15625)

+++ trunk/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/main.c (revision 15626)

		@@ -65,10 +65,12 @@
65	65	.regions = {
66	66	[0] = {
67	67	.area = {STARTUP_FLASH1_BASE, STARTUP_FLASH1_SIZE},
	68	+ .used = true,
68	69	.writeable = false
69	70	},
70	71	[1] = {
71	72	.area = {STARTUP_RAM1_BASE, STARTUP_RAM1_SIZE},
	73	+ .used = true,
72	74	.writeable = true
73	75	}
74	76	},

		@@ -82,10 +84,12 @@
82	84	.regions = {
83	85	[0] = {
84	86	.area = {STARTUP_FLASH2_BASE, STARTUP_FLASH2_SIZE},
	87	+ .used = true,
85	88	.writeable = false
86	89	},
87	90	[1] = {
88	91	.area = {STARTUP_RAM2_BASE, STARTUP_RAM2_SIZE},
	92	+ .used = true,
89	93	.writeable = true
90	94	}
91	95	},

		@@ -92,6 +96,24 @@
92	96	// .vfs_driver = (vfs_driver_c *)&root_overlay_driver
93	97	};
94	98
	99	+static const char *sbx1_argv[] = {
	100	+ "sbx1",
	101	+ NULL
	102	+};
	103	+
	104	+static const char *sbx1_envp[] = {
	105	+ NULL
	106	+};
	107	+
	108	+static const char *sbx2_argv[] = {
	109	+ "sbx2",
	110	+ NULL
	111	+};
	112	+
	113	+static const char *sbx2_envp[] = {
	114	+ NULL
	115	+};
	116	+
95	117	/* Sandbox objects.*/
96	118	sb_class_t sbx1, sbx2;
97	119

		@@ -207,7 +229,7 @@
207	229	/* Starting sandboxed thread 1.*/
208	230	utp1 = sbStartThread(&sbx1, "sbx1",
209	231	waUnprivileged1, sizeof (waUnprivileged1),
210		- NORMALPRIO - 1, NULL, NULL);
	232	+ NORMALPRIO - 1, sbx1_argv, sbx1_envp);
211	233	if (utp1 == NULL) {
212	234	chSysHalt("sbx1 failed");
213	235	}

		@@ -215,7 +237,7 @@
215	237	/* Starting sandboxed thread 2.*/
216	238	utp2 = sbStartThread(&sbx2, "sbx2",
217	239	waUnprivileged2, sizeof (waUnprivileged2),
218		- NORMALPRIO - 1, NULL, NULL);
	240	+ NORMALPRIO - 1, sbx2_argv, sbx2_envp);
219	241	if (utp1 == NULL) {
220	242	chSysHalt("sbx2 failed");
221	243	}