carl9170 firmware build: simplify build process

[carl9170fw.git] / tools / lib / carlfw.c

diff --git a/tools/lib/carlfw.c b/tools/lib/carlfw.c
index 694e8d848a09f11dca33341aadf2d25288a534b0..533abbca7c3e3c6412b421cd507ec412f3083343 100644 (file)
--- a/tools/lib/carlfw.c
+++ b/tools/lib/carlfw.c
@@ -190,18 +190,18 @@ static void *__carlfw_find_desc(struct carlfw_file *file,
        struct carl9170fw_desc_head *tmp = NULL;
 
        while (scan >= 0) {
-               if (file->data[scan] == descid[sizeof(descid) - found - 1])
+               if (file->data[scan] == descid[CARL9170FW_MAGIC_SIZE - found - 1])
                        found++;
                else
                        found = 0;
 
-               if (found == sizeof(descid))
+               if (found == CARL9170FW_MAGIC_SIZE)
                        break;
 
                scan--;
        }
 
-       if (found == sizeof(descid)) {
+       if (found == CARL9170FW_MAGIC_SIZE) {
                tmp = (void *) &file->data[scan];
 
                if (!CHECK_HDR_VERSION(tmp, compatible_revision) &&
@@ -280,7 +280,7 @@ void carlfw_desc_del(struct carlfw *fw,
 }
 
 void *carlfw_desc_mod_len(struct carlfw *fw __unused,
-       struct carl9170fw_desc_head *desc, int len)
+       struct carl9170fw_desc_head *desc, size_t len)
 {
        struct carlfw_list_entry *obj, tmp;
        int new_len = le16_to_cpu(desc->length) + len;
@@ -409,19 +409,10 @@ struct carlfw *carlfw_load(const char *basename)
 
        init_list_head(&fw->desc_list);
 
-       snprintf(filename, sizeof(filename), "%s.dsc", basename);
-       err = __carlfw_load(&fw->hdr, filename, "r");
-
-       snprintf(filename, sizeof(filename), "%s.fw", basename);
-       err = __carlfw_load(&fw->fw, filename, "r");
-       if (!err)
-               goto found;
-
        err = __carlfw_load(&fw->fw, basename, "r");
        if (err)
                goto err_out;
 
-found:
        if (fw->hdr.name)
                hdr_file = &fw->hdr;
        else