efi_loader: use type bool for event states

Queued and signaled describe boolean states of events. So let's use type bool and rename the structure members to is_queued and is_signaled. Update the comments for is_queued and is_signaled. Reported-by: Simon Glass <sjg@chromium.org> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Rob Clark <robdclark@gmail.com> Reviewed-by: Rob Clark <robdclark@gmail.com> Signed-off-by: Alexander Graf <agraf@suse.de>

efi_loader: use type bool for event states
Queued and signaled describe boolean states of events. So let's use type bool and rename the structure members to is_queued and is_signaled. Update the comments for is_queued and is_signaled. Reported-by: Simon Glass <sjg@chromium.org> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Rob Clark <robdclark@gmail.com> Reviewed-by: Rob Clark <robdclark@gmail.com> Signed-off-by: Alexander Graf <agraf@suse.de>
Heinrich Schuchardt · Alexander Graf
1 parent 037ee6f91b
Showing 3 changed files with 21 additions and 21 deletions Side-by-side Diff
include/efi_loader.h
lib/efi_loader/efi_boottime.c
lib/efi_loader/efi_console.c
@@ -136,8 +136,8 @@
  * @nofify_function:	Function to call when the event is triggered
  * @notify_context:	Data to be passed to the notify function
  * @trigger_type:	Type of timer, see efi_set_timer
- * @queued:		The notification functionis queued
- * @signaled:		The event occured
+ * @queued:		The notification function is queued
+ * @signaled:		The event occurred. The event is in the signaled state.
  */
 struct efi_event {
 	uint32_t type;
@@ -147,8 +147,8 @@
 	u64 trigger_next;
 	u64 trigger_time;
 	enum efi_timer_delay trigger_type;
-	int queued;
-	int signaled;
+	bool is_queued;
+	bool is_signaled;
 };
  
  
@@ -164,14 +164,14 @@
 void efi_signal_event(struct efi_event *event)
 {
 	if (event->notify_function) {
-		event->queued = 1;
+		event->is_queued = true;
 		/* Check TPL */
 		if (efi_tpl >= event->notify_tpl)
 			return;
 		EFI_CALL_VOID(event->notify_function(event,
 						     event->notify_context));
 	}
-	event->queued = 0;
+	event->is_queued = false;
 }
  
 static efi_status_t efi_unsupported(const char *funcname)
@@ -316,8 +316,8 @@
 		efi_events[i].notify_context = notify_context;
 		/* Disable timers on bootup */
 		efi_events[i].trigger_next = -1ULL;
-		efi_events[i].queued = 0;
-		efi_events[i].signaled = 0;
+		efi_events[i].is_queued = false;
+		efi_events[i].is_signaled = false;
 		*event = &efi_events[i];
 		return EFI_SUCCESS;
 	}
@@ -350,7 +350,7 @@
 	for (i = 0; i < ARRAY_SIZE(efi_events); ++i) {
 		if (!efi_events[i].type)
 			continue;
-		if (efi_events[i].queued)
+		if (efi_events[i].is_queued)
 			efi_signal_event(&efi_events[i]);
 		if (!(efi_events[i].type & EVT_TIMER) ||
 		    now < efi_events[i].trigger_next)
@@ -366,7 +366,7 @@
 		default:
 			continue;
 		}
-		efi_events[i].signaled = 1;
+		efi_events[i].is_signaled = true;
 		efi_signal_event(&efi_events[i]);
 	}
 	WATCHDOG_RESET();
@@ -403,7 +403,7 @@
 		}
 		event->trigger_type = type;
 		event->trigger_time = trigger_time;
-		event->signaled = 0;
+		event->is_signaled = false;
 		return EFI_SUCCESS;
 	}
 	return EFI_INVALID_PARAMETER;
  
@@ -440,14 +440,14 @@
 known_event:
 		if (!event[i]->type || event[i]->type & EVT_NOTIFY_SIGNAL)
 			return EFI_EXIT(EFI_INVALID_PARAMETER);
-		if (!event[i]->signaled)
+		if (!event[i]->is_signaled)
 			efi_signal_event(event[i]);
 	}
  
 	/* Wait for signal */
 	for (;;) {
 		for (i = 0; i < num_events; ++i) {
-			if (event[i]->signaled)
+			if (event[i]->is_signaled)
 				goto out;
 		}
 		/* Allow events to occur. */
@@ -459,7 +459,7 @@
 	 * Reset the signal which is passed to the caller to allow periodic
 	 * events to occur.
 	 */
-	event[i]->signaled = 0;
+	event[i]->is_signaled = false;
 	if (index)
 		*index = i;
  
  
@@ -474,9 +474,9 @@
 	for (i = 0; i < ARRAY_SIZE(efi_events); ++i) {
 		if (event != &efi_events[i])
 			continue;
-		if (event->signaled)
+		if (event->is_signaled)
 			break;
-		event->signaled = 1;
+		event->is_signaled = true;
 		if (event->type & EVT_NOTIFY_SIGNAL)
 			efi_signal_event(event);
 		break;
@@ -493,8 +493,8 @@
 		if (event == &efi_events[i]) {
 			event->type = 0;
 			event->trigger_next = -1ULL;
-			event->queued = 0;
-			event->signaled = 0;
+			event->is_queued = false;
+			event->is_signaled = false;
 			return EFI_EXIT(EFI_SUCCESS);
 		}
 	}
  
@@ -512,9 +512,9 @@
 			continue;
 		if (!event->type || event->type & EVT_NOTIFY_SIGNAL)
 			break;
-		if (!event->signaled)
+		if (!event->is_signaled)
 			efi_signal_event(event);
-		if (event->signaled)
+		if (event->is_signaled)
 			return EFI_EXIT(EFI_SUCCESS);
 		return EFI_EXIT(EFI_NOT_READY);
 	}
@@ -460,7 +460,7 @@
 {
 	EFI_ENTRY("%p, %p", event, context);
 	if (tstc()) {
-		efi_con_in.wait_for_key->signaled = 1;
+		efi_con_in.wait_for_key->is_signaled = true;
 		efi_signal_event(efi_con_in.wait_for_key);
 		}
 	EFI_EXIT(EFI_SUCCESS);
...	...	@@ -136,8 +136,8 @@
136	136	* @nofify_function: Function to call when the event is triggered
137	137	* @notify_context: Data to be passed to the notify function
138	138	* @trigger_type: Type of timer, see efi_set_timer
139		- * @queued: The notification functionis queued
140		- * @signaled: The event occured
	139	+ * @queued: The notification function is queued
	140	+ * @signaled: The event occurred. The event is in the signaled state.
141	141	*/
142	142	struct efi_event {
143	143	uint32_t type;
...	...	@@ -147,8 +147,8 @@
147	147	u64 trigger_next;
148	148	u64 trigger_time;
149	149	enum efi_timer_delay trigger_type;
150		- int queued;
151		- int signaled;
	150	+ bool is_queued;
	151	+ bool is_signaled;
152	152	};
153	153
154	154
...	...	@@ -164,14 +164,14 @@
164	164	void efi_signal_event(struct efi_event *event)
165	165	{
166	166	if (event->notify_function) {
167		- event->queued = 1;
	167	+ event->is_queued = true;
168	168	/* Check TPL */
169	169	if (efi_tpl >= event->notify_tpl)
170	170	return;
171	171	EFI_CALL_VOID(event->notify_function(event,
172	172	event->notify_context));
173	173	}
174		- event->queued = 0;
	174	+ event->is_queued = false;
175	175	}
176	176
177	177	static efi_status_t efi_unsupported(const char *funcname)
...	...	@@ -316,8 +316,8 @@
316	316	efi_events[i].notify_context = notify_context;
317	317	/* Disable timers on bootup */
318	318	efi_events[i].trigger_next = -1ULL;
319		- efi_events[i].queued = 0;
320		- efi_events[i].signaled = 0;
	319	+ efi_events[i].is_queued = false;
	320	+ efi_events[i].is_signaled = false;
321	321	*event = &efi_events[i];
322	322	return EFI_SUCCESS;
323	323	}
...	...	@@ -350,7 +350,7 @@
350	350	for (i = 0; i < ARRAY_SIZE(efi_events); ++i) {
351	351	if (!efi_events[i].type)
352	352	continue;
353		- if (efi_events[i].queued)
	353	+ if (efi_events[i].is_queued)
354	354	efi_signal_event(&efi_events[i]);
355	355	if (!(efi_events[i].type & EVT_TIMER) \|\|
356	356	now < efi_events[i].trigger_next)
...	...	@@ -366,7 +366,7 @@
366	366	default:
367	367	continue;
368	368	}
369		- efi_events[i].signaled = 1;
	369	+ efi_events[i].is_signaled = true;
370	370	efi_signal_event(&efi_events[i]);
371	371	}
372	372	WATCHDOG_RESET();
...	...	@@ -403,7 +403,7 @@
403	403	}
404	404	event->trigger_type = type;
405	405	event->trigger_time = trigger_time;
406		- event->signaled = 0;
	406	+ event->is_signaled = false;
407	407	return EFI_SUCCESS;
408	408	}
409	409	return EFI_INVALID_PARAMETER;
410	410
...	...	@@ -440,14 +440,14 @@
440	440	known_event:
441	441	if (!event[i]->type \|\| event[i]->type & EVT_NOTIFY_SIGNAL)
442	442	return EFI_EXIT(EFI_INVALID_PARAMETER);
443		- if (!event[i]->signaled)
	443	+ if (!event[i]->is_signaled)
444	444	efi_signal_event(event[i]);
445	445	}
446	446
447	447	/* Wait for signal */
448	448	for (;;) {
449	449	for (i = 0; i < num_events; ++i) {
450		- if (event[i]->signaled)
	450	+ if (event[i]->is_signaled)
451	451	goto out;
452	452	}
453	453	/* Allow events to occur. */
...	...	@@ -459,7 +459,7 @@
459	459	* Reset the signal which is passed to the caller to allow periodic
460	460	* events to occur.
461	461	*/
462		- event[i]->signaled = 0;
	462	+ event[i]->is_signaled = false;
463	463	if (index)
464	464	*index = i;
465	465
466	466
...	...	@@ -474,9 +474,9 @@
474	474	for (i = 0; i < ARRAY_SIZE(efi_events); ++i) {
475	475	if (event != &efi_events[i])
476	476	continue;
477		- if (event->signaled)
	477	+ if (event->is_signaled)
478	478	break;
479		- event->signaled = 1;
	479	+ event->is_signaled = true;
480	480	if (event->type & EVT_NOTIFY_SIGNAL)
481	481	efi_signal_event(event);
482	482	break;
...	...	@@ -493,8 +493,8 @@
493	493	if (event == &efi_events[i]) {
494	494	event->type = 0;
495	495	event->trigger_next = -1ULL;
496		- event->queued = 0;
497		- event->signaled = 0;
	496	+ event->is_queued = false;
	497	+ event->is_signaled = false;
498	498	return EFI_EXIT(EFI_SUCCESS);
499	499	}
500	500	}
501	501
...	...	@@ -512,9 +512,9 @@
512	512	continue;
513	513	if (!event->type \|\| event->type & EVT_NOTIFY_SIGNAL)
514	514	break;
515		- if (!event->signaled)
	515	+ if (!event->is_signaled)
516	516	efi_signal_event(event);
517		- if (event->signaled)
	517	+ if (event->is_signaled)
518	518	return EFI_EXIT(EFI_SUCCESS);
519	519	return EFI_EXIT(EFI_NOT_READY);
520	520	}
...	...	@@ -460,7 +460,7 @@
460	460	{
461	461	EFI_ENTRY("%p, %p", event, context);
462	462	if (tstc()) {
463		- efi_con_in.wait_for_key->signaled = 1;
	463	+ efi_con_in.wait_for_key->is_signaled = true;
464	464	efi_signal_event(efi_con_in.wait_for_key);
465	465	}
466	466	EFI_EXIT(EFI_SUCCESS);