The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3e67b90c55b44579c2f73c2fbdeac54087c7495f
commit 3e67b90c55b44579c2f73c2fbdeac54087c7495f Author: Christos Margiolis <[email protected]> AuthorDate: 2026-07-23 13:48:09 +0000 Commit: Christos Margiolis <[email protected]> CommitDate: 2026-08-11 21:02:42 +0000 snd_uaudio: Define USB IDs in usbdevs No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks --- sys/dev/sound/usb/uaudio.c | 134 ++++++++++++++++++++++----------------------- sys/dev/usb/usbdevs | 53 ++++++++++++++++++ 2 files changed, 120 insertions(+), 67 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 837f731ec472..7c01051b7af1 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -715,59 +715,59 @@ static driver_t uaudio_driver = { }; static const STRUCT_USB_HOST_ID uaudio_vendor_audio[] = { - { USB_VPI(USB_VENDOR_ROLAND, 0x0132, 0) }, /* UA-33 */ + { USB_VPI(USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA33, 0) }, }; /* The following table is derived from Linux's quirks-table.h */ static const STRUCT_USB_HOST_ID uaudio_vendor_midi[] = { - { USB_VPI(USB_VENDOR_YAMAHA, 0x1000, 0) }, /* UX256 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1001, 0) }, /* MU1000 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1002, 0) }, /* MU2000 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1003, 0) }, /* MU500 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1004, 3) }, /* UW500 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1005, 0) }, /* MOTIF6 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1006, 0) }, /* MOTIF7 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1007, 0) }, /* MOTIF8 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1008, 0) }, /* UX96 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1009, 0) }, /* UX16 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x100a, 3) }, /* EOS BX */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x100c, 0) }, /* UC-MX */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x100d, 0) }, /* UC-KX */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x100e, 0) }, /* S08 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x100f, 0) }, /* CLP-150 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1010, 0) }, /* CLP-170 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1011, 0) }, /* P-250 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1012, 0) }, /* TYROS */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1013, 0) }, /* PF-500 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1014, 0) }, /* S90 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1015, 0) }, /* MOTIF-R */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1016, 0) }, /* MDP-5 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1017, 0) }, /* CVP-204 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1018, 0) }, /* CVP-206 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1019, 0) }, /* CVP-208 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x101a, 0) }, /* CVP-210 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x101b, 0) }, /* PSR-1100 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x101c, 0) }, /* PSR-2100 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x101d, 0) }, /* CLP-175 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x101e, 0) }, /* PSR-K1 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x101f, 0) }, /* EZ-J24 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1020, 0) }, /* EZ-250i */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1021, 0) }, /* MOTIF ES 6 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1022, 0) }, /* MOTIF ES 7 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1023, 0) }, /* MOTIF ES 8 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1024, 0) }, /* CVP-301 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1025, 0) }, /* CVP-303 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1026, 0) }, /* CVP-305 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1027, 0) }, /* CVP-307 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1028, 0) }, /* CVP-309 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1029, 0) }, /* CVP-309GP */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x102a, 0) }, /* PSR-1500 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x102b, 0) }, /* PSR-3000 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x102e, 0) }, /* ELS-01/01C */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1030, 0) }, /* PSR-295/293 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1031, 0) }, /* DGX-205/203 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1032, 0) }, /* DGX-305 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1033, 0) }, /* DGX-505 */ + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX256, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MU1000, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MU2000, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MU500, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UW500, 3) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF6, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF7, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF8, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX96, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX16, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_EOS_BX, 3) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UCMX, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UCKX, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_S08, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CLP150, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CLP170, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_P250, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_TYROS, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_PF500, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_S90, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIFR, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MDP5, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CVP204, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CVP206, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CVP208, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CVP210, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_PSR1100, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_PSR2100, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CLP175, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_PSRK1, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_EZJ24, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_EZJ250I, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF_ES6, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF_ES7, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF_ES8, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CVP301, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CVP303, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CVP305, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CVP307, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CVP309, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CVP309GP, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_PSR1500, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_PSR3000, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_ELS01_01C, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_PSR295_293, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_DGX205_203, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_DGX305, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_DGX505, 0) }, { USB_VPI(USB_VENDOR_YAMAHA, 0x1034, 0) }, /* NULL */ { USB_VPI(USB_VENDOR_YAMAHA, 0x1035, 0) }, /* NULL */ { USB_VPI(USB_VENDOR_YAMAHA, 0x1036, 0) }, /* NULL */ @@ -802,29 +802,29 @@ static const STRUCT_USB_HOST_ID uaudio_vendor_midi[] = { { USB_VPI(USB_VENDOR_YAMAHA, 0x105b, 0) }, /* NULL */ { USB_VPI(USB_VENDOR_YAMAHA, 0x105c, 0) }, /* NULL */ { USB_VPI(USB_VENDOR_YAMAHA, 0x105d, 0) }, /* NULL */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x1503, 3) }, /* MOX6/MOX8 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x2000, 0) }, /* DGP-7 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x2001, 0) }, /* DGP-5 */ + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOX6_MOX8, 3) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_DGP7, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_DGP5, 0) }, { USB_VPI(USB_VENDOR_YAMAHA, 0x2002, 0) }, /* NULL */ { USB_VPI(USB_VENDOR_YAMAHA, 0x2003, 0) }, /* NULL */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x5000, 0) }, /* CS1D */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x5001, 0) }, /* DSP1D */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x5002, 0) }, /* DME32 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x5003, 0) }, /* DM2000 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x5004, 0) }, /* 02R96 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x5005, 0) }, /* ACU16-C */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x5006, 0) }, /* NHB32-C */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x5007, 0) }, /* DM1000 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x5008, 0) }, /* 01V96 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x5009, 0) }, /* SPX2000 */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x500a, 0) }, /* PM5D */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x500b, 0) }, /* DME64N */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x500c, 0) }, /* DME24N */ + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_CS1D, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_DSP1D, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_DME32, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_DM2000, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_02R96, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_ACU16C, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_NHB32C, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_DM1000, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_01V96, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_SPX2000, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_PM5D, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_DME64N, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_DME24N, 0) }, { USB_VPI(USB_VENDOR_YAMAHA, 0x500d, 0) }, /* NULL */ { USB_VPI(USB_VENDOR_YAMAHA, 0x500e, 0) }, /* NULL */ { USB_VPI(USB_VENDOR_YAMAHA, 0x500f, 0) }, /* NULL */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x7000, 0) }, /* DTX */ - { USB_VPI(USB_VENDOR_YAMAHA, 0x7010, 0) }, /* UB99 */ + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_DTX, 0) }, + { USB_VPI(USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UB99, 0) }, }; static const STRUCT_USB_HOST_ID __used uaudio_devs[] = { diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 13fdebdd9fd8..b8820543fbd2 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -5091,14 +5091,67 @@ product YAMAHA MOTIF7 0x1006 MOTIF7 MIDI Synth. Workstation product YAMAHA MOTIF8 0x1007 MOTIF8 MIDI Synth. Workstation product YAMAHA UX96 0x1008 UX96 MIDI I/F product YAMAHA UX16 0x1009 UX16 MIDI I/F +product YAMAHA EOS_BX 0x100a EOS BX MIDI I/F +product YAMAHA UCMX 0x100c UC-MX MIDI I/F +product YAMAHA UCKX 0x100d UC-KX MIDI I/F product YAMAHA S08 0x100e S08 MIDI Keyboard product YAMAHA CLP150 0x100f CLP-150 digital piano product YAMAHA CLP170 0x1010 CLP-170 digital piano +product YAMAHA P250 0x1011 P-250 digital piano +product YAMAHA TYROS 0x1012 TYROS MIDI Synth. Workstation +product YAMAHA PF500 0x1013 PF-500 digital piano +product YAMAHA S90 0x1014 S90 MIDI Synth. +product YAMAHA MOTIFR 0x1015 MOTIF-R MIDI Synth. Workstation +product YAMAHA MDP5 0x1016 MDP-5 MIDI I/F +product YAMAHA CVP204 0x1017 CVP-204 digital piano +product YAMAHA CVP206 0x1018 CVP-206 digital piano +product YAMAHA CVP208 0x1019 CVP-208 digital piano +product YAMAHA CVP210 0x101a CVP-210 digital piano +product YAMAHA PSR1100 0x101b PSR-1100 digital piano +product YAMAHA PSR2100 0x101c PSR-2100 digital piano +product YAMAHA CLP175 0x101d CLP-175 digital piano +product YAMAHA PSRK1 0x101e PSR-K1 digital piano +product YAMAHA EZJ24 0x101f EZ-J24 digital piano +product YAMAHA EZJ250I 0x1020 EZ-250i digital piano +product YAMAHA MOTIF_ES6 0x1021 MOTIF ES 6 MIDI Synth. Workstation +product YAMAHA MOTIF_ES7 0x1022 MOTIF ES 7 MIDI Synth. Workstation +product YAMAHA MOTIF_ES8 0x1023 MOTIF ES 8 MIDI Synth. Workstation +product YAMAHA CVP301 0x1024 CVP-301 digital piano +product YAMAHA CVP303 0x1025 CVP-303 digital piano +product YAMAHA CVP305 0x1026 CVP-305 digital piano +product YAMAHA CVP307 0x1027 CVP-307 digital piano +product YAMAHA CVP309 0x1028 CVP-309 digital piano +product YAMAHA CVP309GP 0x1029 CVP-309GP digital piano +product YAMAHA PSR1500 0x102a PSR-1500 digital piano +product YAMAHA PSR3000 0x102b PSR-3000 digital piano +product YAMAHA ELS01_01C 0x102e ELS-01/01C digital piano +product YAMAHA PSR295_293 0x1030 PSR-295/293 digital piano +product YAMAHA DGX205_203 0x1031 DGX-205/203 digital piano +product YAMAHA DGX305 0x1032 DGX-305 digital piano +product YAMAHA DGX505 0x1033 DGX-505 digital piano +product YAMAHA MOX6_MOX8 0x1503 MOX6/MOX8 MIDI Synth. Workstation +product YAMAHA DGP7 0x2000 DGP-7 digital piano +product YAMAHA DGP5 0x2001 DGP-5 digital piano product YAMAHA RPU200 0x3104 RP-U200 product YAMAHA RTA54I 0x4000 NetVolante RTA54i Broadband&ISDN Router product YAMAHA RTW65B 0x4001 NetVolante RTW65b Broadband Wireless Router product YAMAHA RTW65I 0x4002 NetVolante RTW65i Broadband&ISDN Wireless Router product YAMAHA RTA55I 0x4004 NetVolante RTA55i Broadband VoIP Router +product YAMAHA CS1D 0x5000 CS1D MIDI I/F +product YAMAHA DSP1D 0x5001 DSP1D MIDI I/F +product YAMAHA DME32 0x5002 DME32 MIDI I/F +product YAMAHA DM2000 0x5003 DM2000 MIDI I/F +product YAMAHA 02R96 0x5004 02R96 MIDI I/F +product YAMAHA ACU16C 0x5005 ACU16-C MIDI I/F +product YAMAHA NHB32C 0x5006 NHB32-C MIDI I/F +product YAMAHA DM1000 0x5007 DM1000 MIDI I/F +product YAMAHA 01V96 0x5008 01V96 MIDI I/F +product YAMAHA SPX2000 0x5009 SPX2000 MIDI I/F +product YAMAHA PM5D 0x500a PM5D MIDI I/F +product YAMAHA DME64N 0x500b DME64N MIDI I/F +product YAMAHA DME24N 0x500c DME24N MIDI I/F +product YAMAHA DTX 0x7000 DTX Electronic Drum Kit +product YAMAHA UB99 0x7010 UB99 Multi-Effect Pedal /* Yano products */ product YANO U640MO 0x0101 U640MO-03
