From bc574e3db59556a1916c0cc5fff80cc0ba8b3f94 Mon Sep 17 00:00:00 2001 From: luigi Date: Thu, 15 Feb 2007 17:21:31 +0000 Subject: Cleanup and document the implementation of firmware(9) based on a version that i posted earlier on the -current mailing list, and subsequent feedback received. The core of the change is just in sys/firmware.h and kern/subr_firmware.c, while other files are just adaptation of the clients to the ABI change (const-ification of some parameters and hiding of internal info, so this is fully compatible at the binary level). In detail: - reduce the amount of information exported to clients in struct firmware, and constify the pointer; - internally, document and simplify the implementation of the various functions, and make sure error conditions are dealt with properly. The diffs are large, but the code is really straightforward now (i hope). Note also that there is a subtle issue with the implementation of firmware_register(): currently, as in the previous version, we just store a reference to the 'imagename' argument, but we should rather copy it because there is no guarantee that this is a static string. I realised this while testing this code, but i prefer to fix it in a later commit -- there is no regression with respect to the past. Note, too, that the version in RELENG_6 has various bugs including missing locks around the module release calls, mishandling of modules loaded by /boot/loader, and so on, so an MFC is absolutely necessary there. I was just postponing it until this cleanup to avoid doing things twice. MFC after: 1 week --- sys/dev/isp/isp_freebsd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/dev/isp/isp_freebsd.h') diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index c9868ab..c8247e8 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -166,7 +166,7 @@ struct isposinfo { struct callout_handle ldt; /* loop down timer */ struct callout_handle gdt; /* gone device timer */ #if __FreeBSD_version >= 500000 - struct firmware * fw; + const struct firmware * fw; struct mtx lock; struct cv kthread_cv; union { -- cgit v1.1