chiark / gitweb /
firmware: convert shell script to C
authorPiter PUNK <piterpunk@slackware.com>
Tue, 15 Dec 2009 15:28:52 +0000 (16:28 +0100)
committerKay Sievers <kay.sievers@vrfy.org>
Tue, 15 Dec 2009 15:28:52 +0000 (16:28 +0100)
Makefile.am
TODO
extras/firmware/.gitignore [new file with mode: 0644]
extras/firmware/50-firmware.rules
extras/firmware/firmware.c [new file with mode: 0644]
extras/firmware/firmware.sh [deleted file]

index 993d700..126064b 100644 (file)
@@ -180,15 +180,9 @@ udev_test_udev_SOURCES = \
 udev_test_udev_LDADD = libudev/libudev-private.la
 
 # ------------------------------------------------------------------------------
-# firmware.sh - firmware loading
-# ------------------------------------------------------------------------------
-dist_libexec_SCRIPTS = extras/firmware/firmware.sh
-dist_udevrules_DATA += extras/firmware/50-firmware.rules
-
-# ------------------------------------------------------------------------------
 # rule_generator - persistent network and optical device rule generator
 # ------------------------------------------------------------------------------
-dist_libexec_SCRIPTS += \
+dist_libexec_SCRIPTS = \
        extras/rule_generator/write_cd_rules \
        extras/rule_generator/write_net_rules
 
@@ -200,11 +194,19 @@ dist_udevrules_DATA += \
        extras/rule_generator/75-persistent-net-generator.rules
 
 # ------------------------------------------------------------------------------
+# firmware - firmware loading
+# ------------------------------------------------------------------------------
+extras_firmware_firmware_SOURCES = extras/firmware/firmware.c
+extras_firmware_firmware_LDADD = libudev/libudev-private.la
+dist_udevrules_DATA += extras/firmware/50-firmware.rules
+libexec_PROGRAMS = extras/firmware/firmware
+
+# ------------------------------------------------------------------------------
 # ata_id - ATA identify
 # ------------------------------------------------------------------------------
 extras_ata_id_ata_id_SOURCES = extras/ata_id/ata_id.c
 extras_ata_id_ata_id_LDADD = libudev/libudev-private.la
-libexec_PROGRAMS = extras/ata_id/ata_id
+libexec_PROGRAMS += extras/ata_id/ata_id
 
 # ------------------------------------------------------------------------------
 # cdrom_id - optical drive/media capability
diff --git a/TODO b/TODO
index 1fc80e1..029b70e 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,5 +1,4 @@
 
-  o convert firmware.sh to C
   o get rid of "scan all devices to find myself" libusb interface
       if it can not be fixed, drop libusb entirely and add a simple
       wrapper around the Linux usb ioctls we need
diff --git a/extras/firmware/.gitignore b/extras/firmware/.gitignore
new file mode 100644 (file)
index 0000000..2b8800b
--- /dev/null
@@ -0,0 +1 @@
+firmware
index a28e2a8..a193adb 100644 (file)
@@ -1,4 +1,4 @@
 # do not edit this file, it will be overwritten on update
 
 # firmware-class requests, copies files into the kernel
-SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"
+SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware --firmware=$env{FIRMWARE} --devpath=$env{DEVPATH}"
diff --git a/extras/firmware/firmware.c b/extras/firmware/firmware.c
new file mode 100644 (file)
index 0000000..8f70be4
--- /dev/null
@@ -0,0 +1,195 @@
+/*
+ * firmware - Load firmware device
+ *
+ * Copyright (C) 2009 Piter Punk <piterpunk@slackware.com>
+ * Copyright (C) 2009 Kay Sievers <kay.sievers@vrfy.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details:*
+ */
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <getopt.h>
+#include <errno.h>
+#include <stdbool.h>
+#include <sys/utsname.h>
+#include <sys/stat.h>
+#include "libudev-private.h"
+
+static bool set_loading(struct udev *udev, char *loadpath, const char *state)
+{
+       FILE *ldfile;
+
+       ldfile = fopen(loadpath, "w");
+       if (ldfile == NULL) {
+               err(udev, "error: can not open '%s'\n", loadpath);
+               return false;
+       };
+       fprintf(ldfile, "%s\n", state);
+       fclose(ldfile);
+       return true;
+}
+
+static bool copy_firmware(struct udev *udev, const char *source, const char *target, size_t size)
+{
+       char *buf;
+       FILE *fsource, *ftarget;
+       bool ret = false;
+
+       buf = malloc(size);
+       if (buf == NULL) {
+               err(udev,"No memory available to load firmware file");
+               return false;
+       }
+
+       fsource = fopen(source, "r");
+       if (fsource == NULL)
+               goto exit;
+       ftarget = fopen(target, "w");
+       if (ftarget == NULL)
+               goto exit;
+       if (fread(buf, size, 1, fsource) != 1)
+               goto exit;
+       if (fwrite(buf, size, 1, ftarget) == 1)
+               ret = true;
+exit:
+       fclose(ftarget);
+       fclose(fsource);
+       free(buf);
+       return ret;
+}
+
+int main(int argc, char **argv)
+{
+       static const struct option options[] = {
+               { "firmware", required_argument, NULL, 'f' },
+               { "devpath", required_argument, NULL, 'p' },
+               { "help", no_argument, NULL, 'h' },
+               {}
+       };
+       static const char *searchpath[] = {
+               "/lib/firmware/updates/",
+               "/lib/firmware/"
+       };
+       char fwencpath[UTIL_PATH_SIZE];
+       char misspath[UTIL_PATH_SIZE];
+       char loadpath[UTIL_PATH_SIZE];
+       char datapath[UTIL_PATH_SIZE];
+       char fwpath[UTIL_PATH_SIZE];
+       char *devpath = NULL;
+       char *firmware = NULL;
+       FILE *fwfile;
+       struct utsname kernel;
+       struct stat statbuf;
+       struct udev *udev = NULL;
+       unsigned int i;
+       int rc = 0;
+
+       udev_log_init("firmware");
+
+       for (;;) {
+               int option;
+
+               option = getopt_long(argc, argv, "f:p:h", options, NULL);
+               if (option == -1)
+                       break;
+
+               switch (option) {
+               case 'f':
+                       firmware = optarg;
+                       break;
+               case 'p':
+                       devpath = optarg;
+                       break;
+               case 'h':
+                       printf("Usage: firmware --firmware=<fwfile> --devpath=<path> [--help]\n\n");
+               default:
+                       rc = 1;
+                       goto exit;
+               }
+       }
+
+       if (devpath == NULL || firmware == NULL) {
+               fprintf(stderr, "firmware or devpath parameter missing\n\n");
+               rc = 1;
+               goto exit;
+       }
+
+       udev = udev_new();
+       if (udev == NULL) {
+               rc = 1;
+               goto exit;
+       };
+
+       /* lookup firmware file */
+       uname(&kernel);
+       for (i = 0; i < ARRAY_SIZE(searchpath); i++) {
+               util_strscpyl(fwpath, sizeof(fwpath), searchpath[i], kernel.release, "/", firmware, NULL);
+               dbg(udev, "trying %s\n", fwpath);
+               fwfile = fopen(fwpath, "r");
+               if (fwfile != NULL)
+                       break; 
+
+               util_strscpyl(fwpath, sizeof(fwpath), searchpath[i], firmware, NULL);
+               dbg(udev, "trying %s\n", fwpath);
+               fwfile = fopen(fwpath, "r");
+               if (fwfile != NULL)
+                       break;
+       }
+
+       util_path_encode(firmware, fwencpath, sizeof(fwencpath));
+       util_strscpyl(misspath, sizeof(misspath), udev_get_dev_path(udev), "/.udev/firmware-missing/", fwencpath, NULL);
+
+       if (fwfile == NULL) {
+               int err;
+
+               /* This link indicates the missing firmware file and the associated device */
+               info(udev, "did not find firmware file '%s'\n", firmware);
+               do {
+                       err = util_create_path(udev, misspath);
+                       if (err != 0 && err != -ENOENT)
+                               break;
+                       udev_selinux_setfscreatecon(udev, misspath, S_IFLNK);
+                       err = symlink(devpath, misspath);
+                       if (err != 0)
+                               err = -errno;
+                       udev_selinux_resetfscreatecon(udev);
+               } while (err == -ENOENT);
+               rc = 2;
+               goto exit;
+       }
+
+       if (stat(fwpath, &statbuf) < 0 || statbuf.st_size == 0) {
+               rc = 3;
+               goto exit;
+       }
+       if (unlink(misspath) == 0)
+               util_delete_path(udev, misspath);
+
+       util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL);
+       set_loading(udev, loadpath, "1");
+
+       util_strscpyl(datapath, sizeof(datapath), udev_get_sys_path(udev), devpath, "/data", NULL);
+       if (!copy_firmware(udev, fwpath, datapath, statbuf.st_size)) {
+               err(udev, "error sending firmware '%s' to device\n", firmware);
+               set_loading(udev, loadpath, "-1");
+               rc = 4;
+               goto exit;
+       };
+
+       set_loading(udev, loadpath, "0");
+exit:
+       udev_unref(udev);
+       udev_log_close();
+       return rc;
+}
diff --git a/extras/firmware/firmware.sh b/extras/firmware/firmware.sh
deleted file mode 100755 (executable)
index 9d4659a..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh -e
-
-FIRMWARE_DIRS="/lib/firmware/updates/$(uname -r) /lib/firmware/updates \
-               /lib/firmware/$(uname -r) /lib/firmware"
-
-err() {
-       echo "$@" >&2
-       logger -t "${0##*/}[$$]" "$@" 2>/dev/null || true
-}
-
-if [ ! -e /sys$DEVPATH/loading ]; then
-       err "udev firmware loader misses sysfs directory"
-       exit 1
-fi
-
-for DIR in $FIRMWARE_DIRS; do
-       [ -e "$DIR/$FIRMWARE" ] || continue
-       echo 1 > /sys$DEVPATH/loading
-       cat "$DIR/$FIRMWARE" > /sys$DEVPATH/data
-       echo 0 > /sys$DEVPATH/loading
-       exit 0
-done
-
-echo -1 > /sys$DEVPATH/loading
-err "Cannot find  firmware file '$FIRMWARE'"
-mkdir -p /dev/.udev/firmware-missing
-file=$(echo "$FIRMWARE" | sed 's:/:\\x2f:g')
-ln -s -f "$DEVPATH" /dev/.udev/firmware-missing/$file
-exit 1