@zigc/lib 0.17.0-dev.76 → 0.17.0-dev.813

package/libc/include/generic-netbsd/dev/usb/umcpmio_hid_reports.h

@@ -0,0 +1,499 @@
+/*	$NetBSD: umcpmio_hid_reports.h,v 1.2 2025/03/17 18:24:08 riastradh Exp $	*/
+
+/*
+ * Copyright (c) 2024 Brad Spencer <brad@anduin.eldar.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef	_UMCPMIO_HID_REPORTS_H_
+#define	_UMCPMIO_HID_REPORTS_H_
+
+#include <sys/types.h>
+
+/*
+ * It is nice that all HID reports want a 64 byte request and return a
+ * 64 byte response.
+ */
+
+#define MCP2221_REQ_BUFFER_SIZE 64
+#define MCP2221_RES_BUFFER_SIZE 64
+
+#define	MCP2221_CMD_STATUS		0x10
+
+#define MCP2221_CMD_I2C_FETCH_READ_DATA	0x40
+
+#define MCP2221_CMD_SET_GPIO_CFG	0x50
+#define MCP2221_CMD_GET_GPIO_CFG	0x51
+
+#define MCP2221_CMD_SET_SRAM		0x60
+#define MCP2221_CMD_GET_SRAM		0x61
+
+#define MCP2221_I2C_WRITE_DATA		0x90
+#define MCP2221_I2C_READ_DATA		0x91
+#define MCP2221_I2C_WRITE_DATA_RS	0x92
+#define MCP2221_I2C_READ_DATA_RS	0x93
+#define MCP2221_I2C_WRITE_DATA_NS	0x94
+
+#define MCP2221_CMD_GET_FLASH		0xb0
+#define MCP2221_CMD_SET_FLASH		0xb1
+#define MCP2221_CMD_SEND_FLASH_PASSWORD	0xb2
+
+#define MCP2221_CMD_COMPLETE_OK		0x00
+#define MCP2221_CMD_COMPLETE_NO_SUPPORT	0x02
+#define MCP2221_CMD_COMPLETE_EPERM	0x03
+
+#define MCP2221_I2C_DO_CANCEL		0x10
+#define MCP2221_INTERNAL_CLOCK		12000000
+#define MCP2221_DEFAULT_I2C_SPEED	100000
+#define MCP2221_I2C_SET_SPEED		0x20
+
+/* The request and response structures are, perhaps, over literal. */
+
+struct mcp2221_status_req {
+	uint8_t		cmd; /* MCP2221_CMD_STATUS */
+	uint8_t		dontcare1;
+	uint8_t		cancel_transfer;
+	uint8_t		set_i2c_speed;
+	uint8_t		i2c_clock_divider;
+	uint8_t		dontcare2[59];
+};
+
+#define MCP2221_I2C_SPEED_SET		0x20
+#define MCP2221_I2C_SPEED_BUSY		0x21
+#define MCP2221_ENGINE_T1_MASK_NACK	0x40
+
+struct mcp2221_status_res {
+	uint8_t		cmd;
+	uint8_t		completion;
+	uint8_t		cancel_transfer;
+	uint8_t		set_i2c_speed;
+	uint8_t		i2c_clock_divider;
+	uint8_t		dontcare2[3];
+	uint8_t		internal_i2c_state;
+	uint8_t		lsb_i2c_req_len;
+	uint8_t		msb_i2c_req_len;
+	uint8_t		lsb_i2c_trans_len;
+	uint8_t		msb_i2c_trans_len;
+	uint8_t		internal_i2c_bcount;
+	uint8_t		i2c_speed_divider;
+	uint8_t		i2c_timeout_value;
+	uint8_t		lsb_i2c_address;
+	uint8_t		msb_i2c_address;
+	uint8_t		dontcare3a[2];
+	uint8_t		internal_i2c_state20;
+	uint8_t		dontcare3b;
+	uint8_t		scl_line_value;
+	uint8_t		sda_line_value;
+	uint8_t		interrupt_edge_state;
+	uint8_t		i2c_read_pending;
+	uint8_t		dontcare4[20];
+	uint8_t		mcp2221_hardware_rev_major;
+	uint8_t		mcp2221_hardware_rev_minor;
+	uint8_t		mcp2221_firmware_rev_major;
+	uint8_t		mcp2221_firmware_rev_minor;
+	uint8_t		adc_channel0_lsb;
+	uint8_t		adc_channel0_msb;
+	uint8_t		adc_channel1_lsb;
+	uint8_t		adc_channel1_msb;
+	uint8_t		adc_channel2_lsb;
+	uint8_t		adc_channel2_msb;
+	uint8_t		dontcare5[8];
+};
+
+#define MCP2221_GPIO_CFG_ALTER		0xff
+
+struct mcp2221_set_gpio_cfg_req {
+	uint8_t		cmd; /* MCP2221_CMD_SET_GPIO_CFG */
+	uint8_t		dontcare1;
+
+	uint8_t		alter_gp0_value;
+	uint8_t		new_gp0_value;
+	uint8_t		alter_gp0_dir;
+	uint8_t		new_gp0_dir;
+
+	uint8_t		alter_gp1_value;
+	uint8_t		new_gp1_value;
+	uint8_t		alter_gp1_dir;
+	uint8_t		new_gp1_dir;
+
+	uint8_t		alter_gp2_value;
+	uint8_t		new_gp2_value;
+	uint8_t		alter_gp2_dir;
+	uint8_t		new_gp2_dir;
+
+	uint8_t		alter_gp3_value;
+	uint8_t		new_gp3_value;
+	uint8_t		alter_gp3_dir;
+	uint8_t		new_gp3_dir;
+
+	uint8_t		reserved[46];
+};
+
+struct mcp2221_set_gpio_cfg_res {
+	uint8_t		cmd;
+	uint8_t		completion;
+
+	uint8_t		alter_gp0_value;
+	uint8_t		new_gp0_value;
+	uint8_t		alter_gp0_dir;
+	uint8_t		new_gp0_dir;
+
+	uint8_t		alter_gp1_value;
+	uint8_t		new_gp1_value;
+	uint8_t		alter_gp1_dir;
+	uint8_t		new_gp1_dir;
+
+	uint8_t		alter_gp2_value;
+	uint8_t		new_gp2_value;
+	uint8_t		alter_gp2_dir;
+	uint8_t		new_gp2_dir;
+
+	uint8_t		alter_gp3_value;
+	uint8_t		new_gp3_value;
+	uint8_t		alter_gp3_dir;
+	uint8_t		new_gp3_dir;
+
+	uint8_t		dontcare[46];
+};
+
+struct mcp2221_get_gpio_cfg_req {
+	uint8_t		cmd; /* MCP2221_CMD_GET_GPIO_CFG */
+	uint8_t		dontcare[63];
+};
+
+#define MCP2221_GPIO_CFG_VALUE_NOT_GPIO	0xEE
+#define MCP2221_GPIO_CFG_DIR_NOT_GPIO	0xEF
+#define MCP2221_GPIO_CFG_DIR_INPUT	0x01
+#define MCP2221_GPIO_CFG_DIR_OUTPUT	0x00
+
+struct mcp2221_get_gpio_cfg_res {
+	uint8_t		cmd;
+	uint8_t		completion;
+
+	uint8_t		gp0_pin_value;
+	uint8_t		gp0_pin_dir;
+
+	uint8_t		gp1_pin_value;
+	uint8_t		gp1_pin_dir;
+
+	uint8_t		gp2_pin_value;
+	uint8_t		gp2_pin_dir;
+
+	uint8_t		gp3_pin_value;
+	uint8_t		gp3_pin_dir;
+
+	uint8_t		dontcare[54];
+};
+
+#define MCP2221_SRAM_GPIO_CHANGE_DCCD	0x80
+
+#define MCP2221_SRAM_GPIO_CLOCK_DC_MASK	0x18
+#define MCP2221_SRAM_GPIO_CLOCK_DC_75	0x18
+#define MCP2221_SRAM_GPIO_CLOCK_DC_50	0x10
+#define MCP2221_SRAM_GPIO_CLOCK_DC_25	0x08
+#define MCP2221_SRAM_GPIO_CLOCK_DC_0	0x00
+
+#define MCP2221_SRAM_GPIO_CLOCK_CD_MASK	0x07
+#define MCP2221_SRAM_GPIO_CLOCK_CD_375KHZ 0x07
+#define MCP2221_SRAM_GPIO_CLOCK_CD_750KHZ 0x06
+#define MCP2221_SRAM_GPIO_CLOCK_CD_1P5MHZ 0x05
+#define MCP2221_SRAM_GPIO_CLOCK_CD_3MHZ 0x04
+#define MCP2221_SRAM_GPIO_CLOCK_CD_6MHZ 0x03
+#define MCP2221_SRAM_GPIO_CLOCK_CD_12MHZ 0x02
+#define MCP2221_SRAM_GPIO_CLOCK_CD_24MHZ 0x01
+
+#define MCP2221_SRAM_CHANGE_DAC_VREF	0x80
+#define MCP2221_SRAM_DAC_IS_VRM		0x20
+#define MCP2221_SRAM_DAC_VRM_MASK	0xC0
+#define MCP2221_SRAM_DAC_VRM_4096V	0xC0
+#define MCP2221_SRAM_DAC_VRM_2048V	0x80
+#define MCP2221_SRAM_DAC_VRM_1024V	0x40
+#define MCP2221_SRAM_DAC_VRM_OFF	0x00
+#define MCP2221_SRAM_CHANGE_DAC_VALUE	0x80
+#define MCP2221_SRAM_DAC_VALUE_MASK	0x1F
+
+#define MCP2221_SRAM_CHANGE_ADC_VREF	0x80
+#define MCP2221_SRAM_ADC_IS_VRM		0x04
+#define MCP2221_SRAM_ADC_VRM_MASK	0x18
+#define MCP2221_SRAM_ADC_VRM_4096V	0x18
+#define MCP2221_SRAM_ADC_VRM_2048V	0x10
+#define MCP2221_SRAM_ADC_VRM_1024V	0x08
+#define MCP2221_SRAM_ADC_VRM_OFF	0x00
+
+#define MCP2221_SRAM_ALTER_IRQ		0x80
+#define MCP2221_SRAM_ALTER_POS_EDGE	0x10
+#define MCP2221_SRAM_ENABLE_POS_EDGE	0x08
+#define MCP2221_SRAM_ALTER_NEG_EDGE	0x04
+#define MCP2221_SRAM_ENABLE_NEG_EDGE	0x02
+#define MCP2221_SRAM_CLEAR_IRQ		0x01
+
+#define MCP2221_SRAM_ALTER_GPIO		0xff
+#define MCP2221_SRAM_GPIO_HIGH		0x0f
+#define MCP2221_SRAM_GPIO_OUTPUT_HIGH	0x10
+#define MCP2221_SRAM_GPIO_TYPE_MASK	0x08
+#define MCP2221_SRAM_GPIO_INPUT		0x08
+#define MCP2221_SRAM_PIN_TYPE_MASK	0x07
+#define MCP2221_SRAM_PIN_IS_GPIO	0x00
+#define MCP2221_SRAM_PIN_IS_DED		0x01
+#define MCP2221_SRAM_PIN_IS_ALT0	0x02
+#define MCP2221_SRAM_PIN_IS_ALT1	0x03
+#define MCP2221_SRAM_PIN_IS_ALT2	0x04
+
+struct mcp2221_set_sram_req {
+	uint8_t		cmd; /* MCP2221_CMD_SET_SRAM */
+	uint8_t		dontcare1;
+
+	uint8_t		clock_output_divider;
+	uint8_t		dac_voltage_reference;
+	uint8_t		set_dac_output_value;
+	uint8_t		adc_voltage_reference;
+	uint8_t		irq_config;
+
+	uint8_t		alter_gpio_config;
+	uint8_t		gp0_settings;
+	uint8_t		gp1_settings;
+	uint8_t		gp2_settings;
+	uint8_t		gp3_settings;
+
+	uint8_t		reserved[52];
+};
+
+struct mcp2221_set_sram_res {
+	uint8_t		cmd;
+	uint8_t		completion;
+	uint8_t		dontcare[62];
+};
+
+struct mcp2221_get_sram_req {
+	uint8_t		cmd; /* MCP2221_CMD_GET_SRAM */
+	uint8_t		dontcare[63];
+};
+
+struct mcp2221_get_sram_res {
+	uint8_t		cmd;
+	uint8_t		completion;
+
+	uint8_t		len_chip_setting;
+	uint8_t		len_gpio_setting;
+
+	uint8_t		sn_initial_ps_cs;
+	uint8_t		clock_divider;
+	uint8_t		dac_reference_voltage;
+	uint8_t		irq_adc_reference_voltage;
+
+	uint8_t		lsb_usb_vid;
+	uint8_t		msb_usb_vid;
+	uint8_t		lsb_usb_pid;
+	uint8_t		msb_usb_pid;
+
+	uint8_t		usb_power_attributes;
+	uint8_t		usb_requested_ma;
+
+	uint8_t		current_password_byte_1;
+	uint8_t		current_password_byte_2;
+	uint8_t		current_password_byte_3;
+	uint8_t		current_password_byte_4;
+	uint8_t		current_password_byte_5;
+	uint8_t		current_password_byte_6;
+	uint8_t		current_password_byte_7;
+	uint8_t		current_password_byte_8;
+
+	uint8_t		gp0_settings;
+	uint8_t		gp1_settings;
+	uint8_t		gp2_settings;
+	uint8_t		gp3_settings;
+
+	uint8_t		dontcare[38];
+};
+
+#define MCP2221_I2C_ENGINE_BUSY		0x01
+#define MCP2221_ENGINE_STARTTIMEOUT	0x12
+#define MCP2221_ENGINE_REPSTARTTIMEOUT	0x17
+#define MCP2221_ENGINE_STOPTIMEOUT	0x62
+#define MCP2221_ENGINE_ADDRSEND		0x21
+#define MCP2221_ENGINE_ADDRTIMEOUT	0x23
+#define MCP2221_ENGINE_PARTIALDATA	0x41
+#define MCP2221_ENGINE_READMORE		0x43
+#define MCP2221_ENGINE_WRITETIMEOUT	0x44
+#define MCP2221_ENGINE_READTIMEOUT	0x52
+#define MCP2221_ENGINE_READPARTIAL	0x54
+#define MCP2221_ENGINE_READCOMPLETE	0x55
+#define MCP2221_ENGINE_ADDRNACK		0x25
+#define MCP2221_ENGINE_WRITINGNOSTOP	0x45
+
+struct mcp2221_i2c_req {
+	uint8_t		cmd; /* MCP2221_I2C_WRITE_DATA
+			      * MCP2221_I2C_READ_DATA
+			      * MCP2221_I2C_WRITE_DATA_RS
+			      * MCP2221_I2C_READ_DATA_RS
+			      * MCP2221_I2C_WRITE_DATA_NS
+			      */
+	uint8_t		lsblen;
+	uint8_t		msblen;
+	uint8_t		slaveaddr;
+	uint8_t		data[60];
+};
+
+struct mcp2221_i2c_res {
+	uint8_t		cmd;
+	uint8_t		completion;
+	uint8_t		internal_i2c_state;
+	uint8_t		dontcare[61];
+};
+
+#define MCP2221_FETCH_READ_PARTIALDATA	0x41
+#define MCP2221_FETCH_READERROR		0x7F
+
+struct mcp2221_i2c_fetch_req {
+	uint8_t		cmd; /* MCP2221_CMD_I2C_FETCH_READ_DATA */
+	uint8_t		dontcare[63];
+};
+
+struct mcp2221_i2c_fetch_res {
+	uint8_t		cmd;
+	uint8_t		completion;
+	uint8_t		internal_i2c_state;
+	uint8_t		fetchlen;
+	uint8_t		data[60];
+};
+
+#define MCP2221_FLASH_SUBCODE_CS	0x00
+#define MCP2221_FLASH_SUBCODE_GP	0x01
+#define MCP2221_FLASH_SUBCODE_USBMAN	0x02
+#define MCP2221_FLASH_SUBCODE_USBPROD	0x03
+#define MCP2221_FLASH_SUBCODE_USBSN	0x04
+#define MCP2221_FLASH_SUBCODE_CHIPSN	0x05
+
+struct mcp2221_get_flash_req {
+	uint8_t		cmd; /* MCP2221_CMD_GET_FLASH */
+	uint8_t		subcode;
+	uint8_t		reserved[62];
+};
+
+struct mcp2221_get_flash_res {
+	uint8_t		cmd;
+	uint8_t		completion;
+	uint8_t		res_len;
+	union {
+		struct {
+			uint8_t		dontcare;
+			uint8_t		uartenum_led_protection;
+			uint8_t		clock_divider;
+			uint8_t		dac_reference_voltage;
+			uint8_t		irq_adc_reference_voltage;
+			uint8_t		lsb_usb_vid;
+			uint8_t		msb_usb_vid;
+			uint8_t		lsb_usb_pid;
+			uint8_t		msb_usb_pid;
+			uint8_t		usb_power_attributes;
+			uint8_t		usb_requested_ma;
+			uint8_t		dontcare2[50];
+		} cs;
+		struct {
+			uint8_t		dontcare;
+			uint8_t		gp0_settings;
+			uint8_t		gp1_settings;
+			uint8_t		gp2_settings;
+			uint8_t		gp3_settings;
+			uint8_t		dontcare2[56];
+		} gp;
+		struct {
+			uint8_t		always0x03;
+			uint8_t		unicode_man_descriptor[60];
+		} usbman;
+		struct {
+			uint8_t		always0x03;
+			uint8_t		unicode_product_descriptor[60];
+		} usbprod;
+		struct usbsn {
+			uint8_t		always0x03;
+			uint8_t		unicode_serial_number[60];
+		} usbsn;
+		struct {
+			uint8_t		dontcare;
+			uint8_t		factory_serial_number[60];
+		} chipsn;
+	} u;
+};
+
+#define MCP2221_FLASH_GPIO_HIGH		0x0f
+#define MCP2221_FLASH_GPIO_VALUE_MASK	0x10
+#define MCP2221_FLASH_GPIO_TYPE_MASK	0x08
+#define MCP2221_FLASH_GPIO_INPUT	0x08
+#define MCP2221_FLASH_PIN_TYPE_MASK	0x07
+#define MCP2221_FLASH_PIN_IS_GPIO	0x00
+#define MCP2221_FLASH_PIN_IS_DED	0x01
+#define MCP2221_FLASH_PIN_IS_ALT0	0x02
+#define MCP2221_FLASH_PIN_IS_ALT1	0x03
+#define MCP2221_FLASH_PIN_IS_ALT2	0x04
+
+struct mcp2221_put_flash_req {
+	uint8_t		cmd; /* MCP2221_CMD_SET_FLASH */
+	uint8_t		subcode;
+	union {
+		struct {
+			uint8_t		uartenum_led_protection;
+			uint8_t		clock_divider;
+			uint8_t		dac_reference_voltage;
+			uint8_t		irq_adc_reference_voltage;
+			uint8_t		lsb_usb_vid;
+			uint8_t		msb_usb_vid;
+			uint8_t		lsb_usb_pid;
+			uint8_t		msb_usb_pid;
+			uint8_t		usb_power_attributes;
+			uint8_t		usb_requested_ma;
+			uint8_t		password_byte_1;
+			uint8_t		password_byte_2;
+			uint8_t		password_byte_3;
+			uint8_t		password_byte_4;
+			uint8_t		password_byte_5;
+			uint8_t		password_byte_6;
+			uint8_t		password_byte_7;
+			uint8_t		password_byte_8;
+			uint8_t		dontcare[44];
+		} cs;
+		struct {
+			uint8_t		gp0_settings;
+			uint8_t		gp1_settings;
+			uint8_t		gp2_settings;
+			uint8_t		gp3_settings;
+			uint8_t		dontcare[58];
+		} gp;
+		struct {
+			uint8_t		len;
+			uint8_t		always0x03;
+			uint8_t		unicode_man_descriptor[60];
+		} usbman;
+		struct {
+			uint8_t		len;
+			uint8_t		always0x03;
+			uint8_t		unicode_product_descriptor[60];
+		} usbprod;
+		struct {
+			uint8_t		len;
+			uint8_t		always0x03;
+			uint8_t		unicode_serial_number[60];
+		} usbsn;
+	} u;
+};
+
+struct mcp2221_put_flash_res {
+	uint8_t		cmd;
+	uint8_t		completion;
+	uint8_t		dontcare[62];
+};
+
+/* XXX - missing is the submit password call to unlock the chip */
+
+#endif	/* _UMCPMIO_HID_REPORTS_H_ */

package/libc/include/generic-netbsd/dev/usb/umcpmio_io.h

@@ -0,0 +1,45 @@
+/*	$NetBSD: umcpmio_io.h,v 1.2 2025/03/17 18:24:08 riastradh Exp $	*/
+
+/*
+ * Copyright (c) 2024 Brad Spencer <brad@anduin.eldar.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _UMCPMIO_IO_H_
+#define _UMCPMIO_IO_H_
+
+#include <sys/types.h>
+
+#include <sys/ioccom.h>
+
+#include <dev/usb/umcpmio_hid_reports.h>
+
+struct umcpmio_ioctl_get_flash {
+	uint8_t subcode;
+	struct mcp2221_get_flash_res get_flash_res;
+};
+
+struct umcpmio_ioctl_put_flash {
+	uint8_t subcode;
+	struct mcp2221_put_flash_req put_flash_req;
+	struct mcp2221_put_flash_res put_flash_res;
+};
+
+#define UMCPMIO_GET_STATUS	_IOR('m', 1, struct mcp2221_status_res)
+#define UMCPMIO_GET_SRAM	_IOR('m', 2, struct mcp2221_get_sram_res)
+#define UMCPMIO_GET_GP_CFG	_IOR('m', 3, struct mcp2221_get_gpio_cfg_res)
+#define UMCPMIO_GET_FLASH	_IOWR('m', 4, struct umcpmio_ioctl_get_flash)
+#define UMCPMIO_PUT_FLASH	_IOWR('m', 5, struct umcpmio_ioctl_put_flash)
+
+#endif	/* _UMCPMIO_IO_H_ */

package/libc/include/generic-netbsd/dev/usb/usb.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: usb.h,v 1.121.4.1 2024/02/03 11:47:07 martin Exp $	*/
+/*	$NetBSD: usb.h,v 1.124.4.1 2026/02/02 19:58:44 martin Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -746,6 +746,38 @@ typedef struct {
 #define   UIPROTO_BLUETOOTH		0x01
 #define   UIPROTO_RNDIS			0x03
 
+#define UICLASS_MISC		0xef
+#define  UISUBCLASS_MISC_SYNC		0x01
+#define   UIPROTO_MISC_SYNC_ACTIVE		0x01
+#define   UIPROTO_MISC_SYNC_PALM		0x02
+#define  UISUBCLASS_MISC_INTERFACE	0x02
+#define   UIPROTO_MISC_INTERFACE_ASSOC		0x01
+#define   UIPROTO_MISC_INTERFACE_WAMP		0x02
+#define  UISUBCLASS_MISC_CABLE		0x03
+#define   UIPROTO_MISC_CABLE_ASSOC		0x01
+#define  UISUBCLASS_MISC_RNDIS		0x04
+#define   UIPROTO_MISC_RNDIS_ETHERNET		0x01
+#define   UIPROTO_MISC_RNDIS_WIFI		0x02
+#define   UIPROTO_MISC_RNDIS_WIMAX		0x03
+#define   UIPROTO_MISC_RNDIS_WWAN		0x04
+#define   UIPROTO_MISC_RNDIS_RAW_IPV4		0x05
+#define   UIPROTO_MISC_RNDIS_RAW_IPV6		0x06
+#define   UIPROTO_MISC_RNDIS_GPRS		0x07
+#define  UISUBCLASS_MISC_VISION		0x05
+#define   UIPROTO_MISC_VISION_CONTROL		0x01
+#define   UIPROTO_MISC_VISION_EVENT		0x02
+#define   UIPROTO_MISC_VISION_STREAMING		0x03
+#define  UISUBCLASS_MISC_STEP		0x06
+#define   UIPROTO_MISC_STEP			0x01
+#define   UIPROTO_MISC_STEP_RAW			0x02
+#define  UISUBCLASS_MISC_DVB		0x07
+#define   UIPROTO_MISC_DVB_CMD			0x01
+#define   UIPROTO_MISC_DVB_MEDIA		0x02
+#define  UISUBCLASS_MISC_OCP_SECFIRMWARE 0x08
+#define   UIPROTO_MISC_MISC_OCP_SECFIRMWARE_RECOVERY 0x01
+#define  UISUBCLASS_MISC_OCP_OMBF	0x09
+#define   UIPROTO_MISC_MISC_OCP_OMBF_ICP	0x01
+
 #define UICLASS_APPL_SPEC	0xfe
 #define  UISUBCLASS_FIRMWARE_DOWNLOAD	1
 #define  UISUBCLASS_IRDA		2
@@ -913,7 +945,7 @@ struct usb_device_info {
 };
 
 /* <=3.0 had this layout of the structure */
-struct usb_device_info_old {
+struct usb_device_info30 {
 	uint8_t		udi_bus;
 	uint8_t		udi_addr;       /* device address */
 	usb_event_cookie_t udi_cookie;
@@ -973,14 +1005,14 @@ struct usb_event {
 };
 
 /* old <=3.0 compat event */
-struct usb_event_old {
+struct usb_event30 {
 	int                     ue_type;
 	struct timespec         ue_time;
 	union {
 		struct {
 			int                     ue_bus;
 		} ue_ctrlr;
-		struct usb_device_info_old          ue_device;
+		struct usb_device_info30	ue_device;
 		struct {
 			usb_event_cookie_t      ue_cookie;
 			char                    ue_devname[16];
@@ -988,13 +1020,19 @@ struct usb_event_old {
 	} u;
 };
 
+#if 1	/* XXX: remove me, for the benefit of sanitizers */
+#define usb_device_info_old usb_device_info30
+#define usb_event_old usb_event30
+#define USB_DEVICEINFO_OLD USB_DEVICEINFO_30
+#define USB_GET_DEVICEINFO_OLD USB_GET_DEVICEINFO_30
+#endif
 
 /* USB controller */
 #define USB_REQUEST		_IOWR('U', 1, struct usb_ctl_request)
 #define USB_SETDEBUG		_IOW ('U', 2, int)
 #define USB_DISCOVER		_IO  ('U', 3)
 #define USB_DEVICEINFO		_IOWR('U', 4, struct usb_device_info)
-#define USB_DEVICEINFO_OLD	_IOWR('U', 4, struct usb_device_info_old)
+#define USB_DEVICEINFO_30	_IOWR('U', 4, struct usb_device_info30)
 #define USB_DEVICESTATS		_IOR ('U', 5, struct usb_device_stats)
 
 /* Generic HID device */
@@ -1018,7 +1056,7 @@ struct usb_event_old {
 #define USB_GET_STRING_DESC	_IOWR('U', 110, struct usb_string_desc)
 #define USB_DO_REQUEST		_IOWR('U', 111, struct usb_ctl_request)
 #define USB_GET_DEVICEINFO	_IOR ('U', 112, struct usb_device_info)
-#define USB_GET_DEVICEINFO_OLD	_IOR ('U', 112, struct usb_device_info_old)
+#define USB_GET_DEVICEINFO_30	_IOR ('U', 112, struct usb_device_info30)
 #define USB_SET_SHORT_XFER	_IOW ('U', 113, int)
 #define USB_SET_TIMEOUT		_IOW ('U', 114, int)
 #define USB_SET_BULK_RA		_IOW ('U', 115, int)

package/libc/include/generic-netbsd/dev/vndvar.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: vndvar.h,v 1.38 2018/10/07 11:51:26 mlelstv Exp $	*/
+/*	$NetBSD: vndvar.h,v 1.39 2025/02/13 01:33:21 gutteridge Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -169,7 +169,7 @@ struct vnd_user {
 /*
  * Before you can use a unit, it must be configured with VNDIOCSET.
  * The configuration persists across opens and closes of the device;
- * an VNDIOCCLR must be used to reset a configuration.  An attempt to
+ * a VNDIOCCLR must be used to reset a configuration.  An attempt to
  * VNDIOCSET an already active unit will return EBUSY.
  */
 #define VNDIOCSET	_IOWR('F', 0, struct vnd_ioctl)	/* enable disk */

package/libc/include/generic-netbsd/dev/wscons/wsconsio.h

@@ -1,4 +1,4 @@
-/* $NetBSD: wsconsio.h,v 1.126.4.1 2024/02/03 11:47:06 martin Exp $ */
+/* $NetBSD: wsconsio.h,v 1.130 2025/07/26 14:18:14 martin Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -367,6 +367,8 @@ struct wsmouse_parameters {
 #define	WSDISPLAY_TYPE_PLFB	65	/* ARM PrimeCell PL11x */
 #define	WSDISPLAY_TYPE_SSDFB	66	/* ssdfb(4) */
 #define	WSDISPLAY_TYPE_HOLLYWOOD 67	/* Nintendo Wii "Hollywood" SoC */
+#define	WSDISPLAY_TYPE_VC6	68	/* Broadcom VideoCore 6 */
+#define	WSDISPLAY_TYPE_VIOGPU	69	/* VirtIO GPU */
 
 /* Basic display information.  Not applicable to all display types. */
 struct wsdisplay_fbinfo {
@@ -729,4 +731,20 @@ struct wsdisplayio_fontinfo {
 
 #define WSDISPLAYIO_LISTFONTS	_IOWR('W', 107, struct wsdisplayio_fontinfo)
 
+struct wsdisplay_getfont {
+	char *gf_name;
+	uint32_t gf_size;
+	uint32_t gf_actual;
+};
+
+/*
+ * return currently active font
+ *
+ * gf_name points to a buffer of gf_size bytes, the result may be truncated
+ * and NUL-terminated.
+ * gf_actual is set to the size of full name.
+ */
+
+#define WSDISPLAYIO_GFONT	_IOWR('W', 108, struct wsdisplay_getfont)
+
 #endif /* _DEV_WSCONS_WSCONSIO_H_ */

package/libc/include/generic-netbsd/dev/wscons/wsksymdef.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: wsksymdef.h,v 1.77 2021/09/22 17:37:32 nia Exp $ */
+/*	$NetBSD: wsksymdef.h,v 1.78 2023/12/11 13:38:13 mlelstv Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -687,7 +687,7 @@ action(KB_UA,	0,	0x1200,	"ua",	,	"Ukrainian")
 
 /* Define all the KB_xx numeric values using above table */
 #define KBF_ENUM(tag, tagf, value, cc, ccf, country) tag=value,
-enum { KB_ENC_FUN(KBF_ENUM) KB_NEXT=0x1d00 };
+enum { KB_ENC_FUN(KBF_ENUM) KB_NEXT=0x2200 };
 
 /* Define list of KB_xxx and country codes for array initialisation */
 #define KBF_ENCTAB(tag, tagf, value, cc, ccf, country) { tag, cc },