From cbbb73f4f9b0d7890c045fe8e159f651fbdca685 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 31 Dec 2023 14:55:58 -0700 Subject: sim: fix pervasive typo I noticed a typo in a sim constant. This patch fixes it. permenant -> permanent --- sim/ppc/basics.h | 2 +- sim/ppc/device.c | 36 ++++++++++++++++++------------------ sim/ppc/tree.c | 2 +- sim/ppc/tree.h | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) (limited to 'sim/ppc') diff --git a/sim/ppc/basics.h b/sim/ppc/basics.h index 7c54b73..d4abbc5 100644 --- a/sim/ppc/basics.h +++ b/sim/ppc/basics.h @@ -54,7 +54,7 @@ typedef enum { /* disposition of an object when things are next restarted */ typedef enum { - permenant_object, + permanent_object, tempoary_object, } object_disposition; diff --git a/sim/ppc/device.c b/sim/ppc/device.c index 45dda89..6d093cb 100644 --- a/sim/ppc/device.c +++ b/sim/ppc/device.c @@ -90,8 +90,8 @@ detach_device_interrupt_edge(device *me, if (old_edge->dest == dest && old_edge->dest_port == dest_port && old_edge->my_port == my_port) { - if (old_edge->disposition == permenant_object) - device_error(me, "attempt to delete permenant interrupt"); + if (old_edge->disposition == permanent_object) + device_error(me, "attempt to delete permanent interrupt"); *list = old_edge->next; free(old_edge); return; @@ -107,7 +107,7 @@ clean_device_interrupt_edges(device_interrupt_edge **list) while (*list != NULL) { device_interrupt_edge *old_edge = *list; switch (old_edge->disposition) { - case permenant_object: + case permanent_object: list = &old_edge->next; break; case tempoary_object: @@ -806,7 +806,7 @@ clean_device_properties(device *me) while (*delete_point != NULL) { device_property_entry *current = *delete_point; switch (current->value->disposition) { - case permenant_object: + case permanent_object: /* zap the current value, will be initialized later */ ASSERT(current->init_array != NULL); if (current->value->array != NULL) { @@ -840,7 +840,7 @@ device_init_static_properties(device *me, property = property->next) { ASSERT(property->init_array != NULL); ASSERT(property->value->array == NULL); - ASSERT(property->value->disposition == permenant_object); + ASSERT(property->value->disposition == permanent_object); switch (property->value->type) { case array_property: case boolean_property: @@ -872,7 +872,7 @@ device_init_runtime_properties(device *me, property != NULL; property = property->next) { switch (property->value->disposition) { - case permenant_object: + case permanent_object: switch (property->value->type) { case ihandle_property: { @@ -956,7 +956,7 @@ device_add_array_property(device *me, { device_add_property(me, property, array_property, array, sizeof_array, array, sizeof_array, - NULL, permenant_object); + NULL, permanent_object); } INLINE_DEVICE\ @@ -993,7 +993,7 @@ device_add_boolean_property(device *me, device_add_property(me, property, boolean_property, &new_boolean, sizeof(new_boolean), &new_boolean, sizeof(new_boolean), - NULL, permenant_object); + NULL, permanent_object); } INLINE_DEVICE\ @@ -1023,7 +1023,7 @@ device_add_ihandle_runtime_property(device *me, device_add_property(me, property, ihandle_property, ihandle->full_path, strlen(ihandle->full_path) + 1, NULL, 0, - NULL, permenant_object); + NULL, permanent_object); } INLINE_DEVICE\ @@ -1038,7 +1038,7 @@ device_find_ihandle_runtime_property(device *me, me, property)); if (entry == NULL || entry->value->type != ihandle_property - || entry->value->disposition != permenant_object) + || entry->value->disposition != permanent_object) device_error(me, "property %s not found or of wrong type", property); ASSERT(entry->init_array != NULL); /* the full path */ @@ -1093,7 +1093,7 @@ device_add_integer_property(device *me, device_add_property(me, property, integer_property, &integer, sizeof(integer), &integer, sizeof(integer), - NULL, permenant_object); + NULL, permanent_object); } INLINE_DEVICE\ @@ -1225,7 +1225,7 @@ device_add_range_array_property(device *me, device_add_property(me, property, range_array_property, cells, sizeof_cells, cells, sizeof_cells, - NULL, permenant_object); + NULL, permanent_object); free(cells); } @@ -1316,7 +1316,7 @@ device_add_reg_array_property(device *me, device_add_property(me, property, reg_array_property, cells, sizeof_cells, cells, sizeof_cells, - NULL, permenant_object); + NULL, permanent_object); free(cells); } @@ -1372,7 +1372,7 @@ device_add_string_property(device *me, device_add_property(me, property, string_property, string, strlen(string) + 1, string, strlen(string) + 1, - NULL, permenant_object); + NULL, permanent_object); } INLINE_DEVICE\ @@ -1424,7 +1424,7 @@ device_add_string_array_property(device *me, device_add_property(me, property, string_array_property, array, sizeof_array, array, sizeof_array, - NULL, permenant_object); + NULL, permanent_object); } INLINE_DEVICE\ @@ -1497,8 +1497,8 @@ device_add_duplicate_property(device *me, TRACE(trace_devices, ("device_add_duplicate_property(me=%p, property=%s, ...)\n", me, property)); - if (original->disposition != permenant_object) - device_error(me, "Can only duplicate permenant objects"); + if (original->disposition != permanent_object) + device_error(me, "Can only duplicate permanent objects"); /* find the original's master */ master = original->owner->properties; while (master->value != original) { @@ -1510,7 +1510,7 @@ device_add_duplicate_property(device *me, original->type, master->init_array, master->sizeof_init_array, original->array, original->sizeof_array, - original, permenant_object); + original, permanent_object); } diff --git a/sim/ppc/tree.c b/sim/ppc/tree.c index 05532bb..c2fe917 100644 --- a/sim/ppc/tree.c +++ b/sim/ppc/tree.c @@ -830,7 +830,7 @@ tree_parse(device *current, my_port, dest, dest_port, - permenant_object); + permanent_object); } break; default: diff --git a/sim/ppc/tree.h b/sim/ppc/tree.h index 6e278d9..d514b01 100644 --- a/sim/ppc/tree.h +++ b/sim/ppc/tree.h @@ -35,7 +35,7 @@ This function accepts a printf style formatted string as the argument that describes the entry. Any properties or interrupt connections added to a device tree using this function are marked - as having a permenant disposition. When the tree is (re) + as having a permanent disposition. When the tree is (re) initialized they will be restored to their initial value. */ -- cgit v1.1