Changed default_family to be registered at new

Author: oyama

flash/partition_info/partition_info.c

@@ -155,8 +155,7 @@ int main() {
         printf("the partition table is empty\n");
     }
 
-    uf2_family_ids_t *family_ids = uf2_family_ids_new();
-    uf2_family_ids_add_default_families(family_ids, pt.flags_and_permissions);
+    uf2_family_ids_t *family_ids = uf2_family_ids_new(pt.flags_and_permissions);
     char *str_family_ids = uf2_family_ids_join(family_ids, ", ");
     printf("un-partitioned_space: S(%s%s) NSBOOT(%s%s) NS(%s%s) uf2 { %s }\n",
            (pt.flags_and_permissions & PICOBIN_PARTITION_PERMISSION_S_R_BITS ? "r" : ""),
@@ -193,8 +192,7 @@ int main() {
         }
 
         // print UF2 family ID
-        family_ids = uf2_family_ids_new();
-        uf2_family_ids_add_default_families(family_ids, p.flags_and_permissions);
+        family_ids = uf2_family_ids_new(p.flags_and_permissions);
         for (size_t i = 0; i < p.extra_family_id_count; i++) {
             uf2_family_ids_add_extra_family_id(family_ids, p.extra_family_ids[i]);
         }

flash/partition_info/uf2_family_ids.c

@@ -2,14 +2,7 @@
 
 #define UF2_FAMILY_ID_HEX_SIZE   (2 + 8 * 2 + 1)
 
-uf2_family_ids_t *uf2_family_ids_new(void) {
-    uf2_family_ids_t *ids = malloc(sizeof(uf2_family_ids_t));
-    ids->count = 0;
-    ids->items = NULL;
-    return ids;
-}
-
-void uf2_family_ids_add(uf2_family_ids_t *ids, const char *str) {
+static void _add(uf2_family_ids_t *ids, const char *str) {
     ids->items = realloc(ids->items, (ids->count + 1) * sizeof(char *));
     ids->items[ids->count] = strdup(str);
     if (ids->items[ids->count] == NULL) {
@@ -19,6 +12,29 @@ void uf2_family_ids_add(uf2_family_ids_t *ids, const char *str) {
     ids->count++;
 }
 
+static void _add_default_families(uf2_family_ids_t *ids, uint32_t flags) {
+    if (flags & PICOBIN_PARTITION_FLAGS_ACCEPTS_DEFAULT_FAMILY_ABSOLUTE_BITS)
+        _add(ids, "absolute");
+    if (flags & PICOBIN_PARTITION_FLAGS_ACCEPTS_DEFAULT_FAMILY_RP2040_BITS)
+        _add(ids, "rp2040");
+    if (flags & PICOBIN_PARTITION_FLAGS_ACCEPTS_DEFAULT_FAMILY_RP2350_ARM_S_BITS)
+        _add(ids, "rp2350-arm-s");
+    if (flags & PICOBIN_PARTITION_FLAGS_ACCEPTS_DEFAULT_FAMILY_RP2350_ARM_NS_BITS)
+        _add(ids, "rp2350-arm-ns");
+    if (flags & PICOBIN_PARTITION_FLAGS_ACCEPTS_DEFAULT_FAMILY_RP2350_RISCV_BITS)
+        _add(ids, "rp2350-riscv");
+    if (flags & PICOBIN_PARTITION_FLAGS_ACCEPTS_DEFAULT_FAMILY_DATA_BITS)
+        _add(ids, "data");
+}
+
+uf2_family_ids_t *uf2_family_ids_new(uint32_t flags) {
+    uf2_family_ids_t *ids = malloc(sizeof(uf2_family_ids_t));
+    ids->count = 0;
+    ids->items = NULL;
+    _add_default_families(ids, flags);
+    return ids;
+}
+
 char *uf2_family_ids_join(const uf2_family_ids_t *ids, const char *sep) {
     size_t total_length = 0;
     size_t sep_length = strlen(sep);
@@ -53,23 +69,8 @@ void uf2_family_ids_free(uf2_family_ids_t *ids) {
     free(ids);
 }
 
-void uf2_family_ids_add_default_families(uf2_family_ids_t *ids, uint32_t flags) {
-    if (flags & PICOBIN_PARTITION_FLAGS_ACCEPTS_DEFAULT_FAMILY_ABSOLUTE_BITS)
-        uf2_family_ids_add(ids, "absolute");
-    if (flags & PICOBIN_PARTITION_FLAGS_ACCEPTS_DEFAULT_FAMILY_RP2040_BITS)
-        uf2_family_ids_add(ids, "rp2040");
-    if (flags & PICOBIN_PARTITION_FLAGS_ACCEPTS_DEFAULT_FAMILY_RP2350_ARM_S_BITS)
-        uf2_family_ids_add(ids, "rp2350-arm-s");
-    if (flags & PICOBIN_PARTITION_FLAGS_ACCEPTS_DEFAULT_FAMILY_RP2350_ARM_NS_BITS)
-        uf2_family_ids_add(ids, "rp2350-arm-ns");
-    if (flags & PICOBIN_PARTITION_FLAGS_ACCEPTS_DEFAULT_FAMILY_RP2350_RISCV_BITS)
-        uf2_family_ids_add(ids, "rp2350-riscv");
-    if (flags & PICOBIN_PARTITION_FLAGS_ACCEPTS_DEFAULT_FAMILY_DATA_BITS)
-        uf2_family_ids_add(ids, "data");
-}
-
 void uf2_family_ids_add_extra_family_id(uf2_family_ids_t *ids, uint32_t family_id) {
     char hex_id[UF2_FAMILY_ID_HEX_SIZE];
     sprintf(hex_id, "0x%08x", family_id);
-    uf2_family_ids_add(ids, hex_id);
+    _add(ids, hex_id);
 }

flash/partition_info/uf2_family_ids.h

@@ -14,10 +14,8 @@ typedef struct {
 } uf2_family_ids_t;
 
 
-uf2_family_ids_t *uf2_family_ids_new(void);
-void uf2_family_ids_add(uf2_family_ids_t *ids, const char *str);
+uf2_family_ids_t *uf2_family_ids_new(uint32_t flags);
 char *uf2_family_ids_join(const uf2_family_ids_t *ids, const char *sep);
 void uf2_family_ids_free(uf2_family_ids_t *ids);
 
-void uf2_family_ids_add_default_families(uf2_family_ids_t *ids, uint32_t flags);
 void uf2_family_ids_add_extra_family_id(uf2_family_ids_t *ids, uint32_t family_id);