From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Yury G. Kudryashov" Date: Fri, 16 Apr 2010 18:52:44 +0000 Subject: Re: two patches Message-Id: MIME-Version: 1 Content-Type: multipart/mixed; boundary="nextPart10873217.p23tIm2Dra" List-Id: References: In-Reply-To: To: linux-hotplug@vger.kernel.org --nextPart10873217.p23tIm2Dra Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7Bit Dan Nicholson wrote: > On Fri, Apr 16, 2010 at 09:50:42AM +0400, Yury G. Kudryashov wrote: >> Hi! >> >> Review the attached patches, please. > >> From 5cc42c6f87f690fdf66e29de2a816dab49a119f4 Mon Sep 17 00:00:00 2001 >> From: Yury G. Kudryashov >> Date: Fri, 16 Apr 2010 00:21:02 +0400 >> Subject: [PATCH 1/2] Include linux/types.h > > 1. Prefix the subject with "hid2hci: " so it's clear from the shortlog > what > this affects. > > 2. Please include some rational in the commit message. What prototype or > datatype is missing that requires including ? Done. >> From f9881e554deafad1301d00e4539a02fe63078c00 Mon Sep 17 00:00:00 2001 >> From: Yury G. Kudryashov >> Date: Fri, 16 Apr 2010 09:38:32 +0400 >> Subject: [PATCH 2/2] Add --with-firmware-path configure option > > Again, please include some rational in the commit message. What problem is > this solving? Done. >> @@ -97,6 +94,11 @@ int main(int argc, char **argv) >> unsigned int i; >> int rc = 0; >> >> + for (i = 0; i < ARRAY_SIZE(searchpath); i++) { >> + printf("Path %s\n", searchpath[i]); >> + } >> + return 0; >> + > > I'm pretty sure the program stops doing anything useful with this hunk. :) I really should stop posting patches after midnight. I hope that the attached version is better. --nextPart10873217.p23tIm2Dra Content-Type: text/x-patch; name="0001-hid2hci-include-linux-types.h-for-__u32.patch" Content-Disposition: attachment; filename="0001-hid2hci-include-linux-types.h-for-__u32.patch" Content-Transfer-Encoding: 8Bit >From 6d2d2d4d2c665539c140bbf471c8d1e30baf508b Mon Sep 17 00:00:00 2001 From: Yury G. Kudryashov Date: Fri, 16 Apr 2010 00:21:02 +0400 Subject: [PATCH 1/2] hid2hci: include linux/types.h for __u32 __u32 in linux/hiddev.h is undefined on my laptop (linux-headers-2.6.28.5). Probably, this is a bug in kernel headers or in my distro but this would not hurt. --- extras/hid2hci/hid2hci.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/extras/hid2hci/hid2hci.c b/extras/hid2hci/hid2hci.c index 0d0a022..839c4fb 100644 --- a/extras/hid2hci/hid2hci.c +++ b/extras/hid2hci/hid2hci.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include -- 1.7.0.5 --nextPart10873217.p23tIm2Dra Content-Type: text/x-patch; name="0002-Add-with-firmware-path-configure-option.patch" Content-Disposition: attachment; filename="0002-Add-with-firmware-path-configure-option.patch" Content-Transfer-Encoding: 8Bit >From c810304553d585bc71ffd5633c3cd9241fd2ce15 Mon Sep 17 00:00:00 2001 From: Yury G. Kudryashov Date: Fri, 16 Apr 2010 09:38:32 +0400 Subject: [PATCH 2/2] Add --with-firmware-path configure option In NixOS we need to use non-standard firmware path: we have no /lib. --- configure.ac | 21 +++++++++++++++++++++ extras/firmware/firmware.c | 5 +---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 492fa02..cce70d1 100644 --- a/configure.ac +++ b/configure.ac @@ -82,6 +82,26 @@ if test "x$enable_extras" = xyes; then fi]) AC_SUBST(PCI_DATABASE) + AC_ARG_WITH(firmware-path, + AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]], + [Firmware search path (default=/lib/firmware/updates:/lib/firmware)]), + [], + [with_firmware_path="/lib/fimware/updates:/lib/fimware"] + ) + OLD_IFS=$IFS + IFS=: + for i in $with_firmware_path + do + if test "x${FIRMWARE_PATH}" = "x" + then + FIRMWARE_PATH="\\\"${i}/\\\"" + else + FIRMWARE_PATH="${FIRMWARE_PATH}, \\\"${i}/\\\"" + fi + done + IFS=$OLD_IFS + AC_SUBST([FIRMWARE_PATH], [$FIRMWARE_PATH]) + AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found])) AC_SUBST([INCLUDE_PREFIX], [$(echo '#include ' | eval $ac_cpp -E - | sed -n '/linux\/input.h/ {s:.*"\(.*\)/linux/input.h".*:\1:; p; q}')]) fi @@ -144,6 +164,7 @@ AC_MSG_RESULT([ usb.ids: ${USB_DATABASE} pci.ids: ${PCI_DATABASE} + firmware path: ${FIRMWARE_PATH} xsltproc: ${XSLTPROC} gperf: ${GPERF} diff --git a/extras/firmware/firmware.c b/extras/firmware/firmware.c index 92f0918..76593ba 100644 --- a/extras/firmware/firmware.c +++ b/extras/firmware/firmware.c @@ -79,10 +79,7 @@ int main(int argc, char **argv) { "help", no_argument, NULL, 'h' }, {} }; - static const char *searchpath[] = { - "/lib/firmware/updates/", - "/lib/firmware/" - }; + static const char *searchpath[] = { FIRMWARE_PATH }; char fwencpath[UTIL_PATH_SIZE]; char misspath[UTIL_PATH_SIZE]; char loadpath[UTIL_PATH_SIZE]; -- 1.7.0.5 --nextPart10873217.p23tIm2Dra--