Module Name: src
Committed By: jmcneill
Date: Fri Dec 13 12:25:39 UTC 2024
Modified Files:
src/sys/dev/acpi: acpi_gpio.c acpi_i2c.c
src/sys/dev/i2c: files.i2c
Log Message:
Attempt to fix build for kernels w/o i2c or gpio.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/acpi_gpio.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/acpi/acpi_i2c.c
cvs rdiff -u -r1.130 -r1.131 src/sys/dev/i2c/files.i2c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_gpio.c
diff -u src/sys/dev/acpi/acpi_gpio.c:1.3 src/sys/dev/acpi/acpi_gpio.c:1.4
--- src/sys/dev/acpi/acpi_gpio.c:1.3 Wed Dec 11 01:00:02 2024
+++ src/sys/dev/acpi/acpi_gpio.c Fri Dec 13 12:25:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_gpio.c,v 1.3 2024/12/11 01:00:02 jmcneill Exp $ */
+/* $NetBSD: acpi_gpio.c,v 1.4 2024/12/13 12:25:39 jmcneill Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -33,8 +33,10 @@
* ACPI GPIO resource support.
*/
+#include "gpio.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_gpio.c,v 1.3 2024/12/11 01:00:02 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_gpio.c,v 1.4 2024/12/13 12:25:39 jmcneill Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -46,6 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_gpio.c,
#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_gpio.h>
+#if NGPIO > 0
struct acpi_gpio_address_space_context {
ACPI_CONNECTION_INFO conn_info; /* must be first */
struct acpi_devnode *ad;
@@ -127,11 +130,13 @@ done:
return rv;
}
+#endif
ACPI_STATUS
acpi_gpio_register(struct acpi_devnode *ad, device_t dev,
int (*translate)(void *, ACPI_RESOURCE_GPIO *, void **), void *priv)
{
+#if NGPIO > 0
struct acpi_gpio_address_space_context *context;
ACPI_STATUS rv;
@@ -161,6 +166,9 @@ acpi_gpio_register(struct acpi_devnode *
ad->ad_gpio_priv = priv;
return AE_OK;
+#else
+ return AE_NOT_CONFIGURED;
+#endif
}
static ACPI_STATUS
Index: src/sys/dev/acpi/acpi_i2c.c
diff -u src/sys/dev/acpi/acpi_i2c.c:1.15 src/sys/dev/acpi/acpi_i2c.c:1.16
--- src/sys/dev/acpi/acpi_i2c.c:1.15 Mon Dec 9 22:29:49 2024
+++ src/sys/dev/acpi/acpi_i2c.c Fri Dec 13 12:25:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_i2c.c,v 1.15 2024/12/09 22:29:49 jmcneill Exp $ */
+/* $NetBSD: acpi_i2c.c,v 1.16 2024/12/13 12:25:39 jmcneill Exp $ */
/*-
* Copyright (c) 2017, 2021 The NetBSD Foundation, Inc.
@@ -29,8 +29,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include "iic.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.15 2024/12/09 22:29:49 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.16 2024/12/13 12:25:39 jmcneill Exp $");
#include <sys/device.h>
@@ -55,10 +57,12 @@ static const struct device_compatible_en
DEVICE_COMPAT_EOL
};
+#if NIIC > 0
struct acpi_i2c_context {
uint16_t i2c_addr;
struct acpi_devnode *res_src;
};
+#endif
static struct acpi_devnode *
acpi_i2c_resource_find_source(ACPI_RESOURCE_SOURCE *rs)
@@ -214,6 +218,7 @@ acpi_enter_i2c_devs(device_t dev, struct
return array;
}
+#if NIIC > 0
static ACPI_STATUS
acpi_i2c_gsb_init(ACPI_HANDLE region_hdl, UINT32 function,
void *handler_ctx, void **region_ctx)
@@ -323,10 +328,12 @@ acpi_i2c_gsb_handler(UINT32 function, AC
return AE_OK;
}
+#endif
ACPI_STATUS
acpi_i2c_register(struct acpi_devnode *devnode, device_t dev, i2c_tag_t tag)
{
+#if NIIC > 0
struct acpi_i2c_address_space_context *context;
ACPI_STATUS rv;
@@ -343,4 +350,7 @@ acpi_i2c_register(struct acpi_devnode *d
}
return rv;
+#else
+ return AE_NOT_CONFIGURED;
+#endif
}
Index: src/sys/dev/i2c/files.i2c
diff -u src/sys/dev/i2c/files.i2c:1.130 src/sys/dev/i2c/files.i2c:1.131
--- src/sys/dev/i2c/files.i2c:1.130 Fri Dec 13 12:03:35 2024
+++ src/sys/dev/i2c/files.i2c Fri Dec 13 12:25:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: files.i2c,v 1.130 2024/12/13 12:03:35 jmcneill Exp $
+# $NetBSD: files.i2c,v 1.131 2024/12/13 12:25:39 jmcneill Exp $
obsolete defflag opt_i2cbus.h I2C_SCAN
define i2cbus { }
@@ -6,7 +6,7 @@ define i2cexec
device iic { [addr = -1] } : i2c_bitbang
attach iic at i2cbus
-file dev/i2c/i2c.c iic
+file dev/i2c/i2c.c iic needs-flag
file dev/i2c/i2c_exec.c iic | i2cbus | i2cexec
file dev/i2c/i2c_subr.c i2cbus
defparam opt_i2c.h I2C_MAX_ADDR
