Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:01:05 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: firmware.h
src/sys/external/bsd/drm2/linux: linux_firmware.c
Log Message:
linux: request_firmware_direct
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/include/linux/firmware.h
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/linux/linux_firmware.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/firmware.h
diff -u src/sys/external/bsd/drm2/include/linux/firmware.h:1.11 src/sys/external/bsd/drm2/include/linux/firmware.h:1.12
--- src/sys/external/bsd/drm2/include/linux/firmware.h:1.11 Sun Dec 19 10:50:46 2021
+++ src/sys/external/bsd/drm2/include/linux/firmware.h Sun Dec 19 12:01:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: firmware.h,v 1.11 2021/12/19 10:50:46 riastradh Exp $ */
+/* $NetBSD: firmware.h,v 1.12 2021/12/19 12:01:04 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -49,10 +49,13 @@ struct firmware {
#define firmware_request_nowarn linux_firmware_request_nowarn
#define release_firmware linux_release_firmware
#define request_firmware linux_request_firmware
+#define request_firmware_direct linux_request_firmware_direct
#define request_firmware_nowait linux_request_firmware_nowait
int request_firmware(const struct firmware **, const char *,
struct device *);
+int request_firmware_direct(const struct firmware **, const char *,
+ struct device *);
int firmware_request_nowarn(const struct firmware **, const char *,
struct device *);
int request_firmware_nowait(struct module *, bool, const char *,
Index: src/sys/external/bsd/drm2/linux/linux_firmware.c
diff -u src/sys/external/bsd/drm2/linux/linux_firmware.c:1.1 src/sys/external/bsd/drm2/linux/linux_firmware.c:1.2
--- src/sys/external/bsd/drm2/linux/linux_firmware.c:1.1 Sun Dec 19 10:50:47 2021
+++ src/sys/external/bsd/drm2/linux/linux_firmware.c Sun Dec 19 12:01:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_firmware.c,v 1.1 2021/12/19 10:50:47 riastradh Exp $ */
+/* $NetBSD: linux_firmware.c,v 1.2 2021/12/19 12:01:04 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_firmware.c,v 1.1 2021/12/19 10:50:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_firmware.c,v 1.2 2021/12/19 12:01:04 riastradh Exp $");
#include <sys/types.h>
#include <sys/device.h>
@@ -98,6 +98,14 @@ fail0: KASSERT(ret);
}
int
+request_firmware_direct(const struct firmware **fwp, const char *image_name,
+ struct device *dev)
+{
+
+ return request_firmware(fwp, image_name, dev);
+}
+
+int
firmware_request_nowarn(const struct firmware **fwp, const char *image_name,
struct device *dev)
{
