Hello,
here a onliner diff against 6.8-current to swap two keys of a
MacBook Pro internal keyboard (macbook5,5) at the right place.
Thanks again !
Mathias mailto:s...@smat.ch
Index: ukbd.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/ukbd.c,v
retrieving revision 1.81
diff -u -p -r1.81 ukbd.c
--- ukbd.c 2 Nov 2020 19:45:18 -0000 1.81
+++ ukbd.c 9 Nov 2020 19:10:08 -0000
@@ -258,6 +258,7 @@ ukbd_attach(struct device *parent, struc
case USB_PRODUCT_APPLE_FOUNTAIN_ISO:
case USB_PRODUCT_APPLE_GEYSER_ISO:
case USB_PRODUCT_APPLE_GEYSER3_ISO:
+ case USB_PRODUCT_APPLE_WELLSPRING3_ISO:
case USB_PRODUCT_APPLE_WELLSPRING6_ISO:
case USB_PRODUCT_APPLE_WELLSPRING8_ISO:
sc->sc_munge = ukbd_apple_iso_munge;
<<<dmesg before compiling new kernel : >>>
OpenBSD 6.8-current (GENERIC.MP) #172: Sun Nov 8 14:01:38 MST 2020
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 8278683648 (7895MB)
avail mem = 8012484608 (7641MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.4 @ 0xe0000 (42 entries)
bios0: vendor Apple Inc. version "MBP55.88Z.00AC.B03.0906151708" date 06/15/09
bios0: Apple Inc. MacBookPro5,5
acpi0 at bios0: ACPI 4.0
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP HPET APIC APIC MCFG ASF! SBST ECDT SSDT SSDT SSDT
acpi0: wakeup devices ADP1(S3) LID0(S3) EC__(S3) OHC1(S3) EHC1(S3) OHC2(S3)
EHC2(S3) GIGE(S5)
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpihpet0 at acpi0: 25000000 Hz
acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Core(TM)2 Duo CPU P8700 @ 2.53GHz, 2521.10 MHz, 06-17-0a
cpu0:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,SSE4.1,XSAVE,NXE,LONG,LAHF,PERF,SENSOR,MELTDOWN
cpu0: 3MB 64b/line 8-way L2 cache
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 265MHz
cpu0: mwait min=64, max=64, C-substates=0.2.2.2.2.1.3, IBE
cpu1 at mainbus0: apid 1 (application processor)
cpu1: Intel(R) Core(TM)2 Duo CPU P8700 @ 2.53GHz, 2520.67 MHz, 06-17-0a
cpu1:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,SSE4.1,XSAVE,NXE,LONG,LAHF,PERF,SENSOR,MELTDOWN
cpu1: 3MB 64b/line 8-way L2 cache
cpu1: smt 0, core 1, package 0
ioapic0 at mainbus0: apid 1 pa 0xfec00000, version 11, 24 pins, remapped
acpimcfg0 at acpi0
acpimcfg0: addr 0xf0000000, bus 0-255
acpiec0 at acpi0
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus 2 (IXVE)
acpisbs0 at acpi0: SBS0 model "bq20z451" serial 48 type LION oem "SMP"
acpiac0 at acpi0: AC unit online
acpibtn0 at acpi0: LID0
abl0 at acpi0: PNLF (backlight)
acpibtn1 at acpi0: PWRB
acpibtn2 at acpi0: SLPB
acpipci0 at acpi0 PCI0: 0x00000010 0x00000011 0x00000000memory map conflict
0xffc00000/0x400000
asmc0 at acpi0: SMC_ (smc-mcp) addr 0x300/0x20: rev 1.47f547, 300 keys
"ACPI0008" at acpi0 not configured
"APP0003" at acpi0 not configured
"ACPI0001" at acpi0 not configured
acpicmos0 at acpi0
acpicpu0 at acpi0: !C3(100@57 mwait.3@0x31), !C2(500@1 mwait@0x10), C1(1000@1
mwait), PSS
acpicpu1 at acpi0: !C3(100@57 mwait.3@0x31), !C2(500@1 mwait@0x10), C1(1000@1
mwait), PSS
cpu0: Enhanced SpeedStep 2521 MHz: speeds: 2527, 2394, 2128, 1862, 1596, 798 MHz
pci0 at mainbus0 bus 0
0:3:5: mem address conflict 0xd3400000/0x80000
pchb0 at pci0 dev 0 function 0 "NVIDIA MCP79 Host" rev 0xb1
"NVIDIA MCP79 Memory" rev 0xb1 at pci0 dev 0 function 1 not configured
pcib0 at pci0 dev 3 function 0 "NVIDIA MCP79 ISA" rev 0xb3
"NVIDIA MCP79 Memory" rev 0xb1 at pci0 dev 3 function 1 not configured
nviic0 at pci0 dev 3 function 2 "NVIDIA MCP79 SMBus" rev 0xb1
iic0 at nviic0
sdtemp0 at iic0 addr 0x18: stts2002
sdtemp1 at iic0 addr 0x19: stts2002
spdmem0 at iic0 addr 0x50: 4GB DDR3 SDRAM PC3-8500 SO-DIMM with thermal sensor
spdmem1 at iic0 addr 0x51: 4GB DDR3 SDRAM PC3-8500 SO-DIMM with thermal sensor
iic1 at nviic0
iic1: addr 0x2c 00=ff 02=08 03=f9 07=60 0d=6c 71=06 86=48 90=71 91=61 92=94
93=79 94=2a 95=3c 96=7a 97=91 9f=0c a0=3d a1=3d a2=3d a3=3d a4=3d a5=3d a6=3d
a7=3d a8=3d a9=3d aa=3d ab=3d ac=3d ad=3d ae=7d af=3d b0=3d b1=3d b2=3d b3=3d
b4=3d b5=3d b6=3d b7=3d b8=3d b9=3d ba=3d bb=3d bc=3d bd=3d be=2d bf=3d words
00=ff00 01=0008 02=08f9 03=f900 04=0000 05=0000 06=0060 07=6000
"NVIDIA MCP79 Memory" rev 0xb1 at pci0 dev 3 function 3 not configured
vendor "NVIDIA", unknown product 0x0a98 (class memory subclass RAM, rev 0xb1)
at pci0 dev 3 function 4 not configured
"NVIDIA MCP79 Co-processor" rev 0xb1 at pci0 dev 3 function 5 not configured
ohci0 at pci0 dev 4 function 0 "NVIDIA MCP79 USB" rev 0xb1: apic 1 int 11,
version 1.0, legacy support
ehci0 at pci0 dev 4 function 1 "NVIDIA MCP79 USB" rev 0xb1: apic 1 int 10
usb0 at ehci0: USB revision 2.0
uhub0 at usb0 configuration 1 interface 0 "NVIDIA EHCI root hub" rev 2.00/1.00
addr 1
ohci1 at pci0 dev 6 function 0 "NVIDIA MCP79 USB" rev 0xb1: apic 1 int 7,
version 1.0, legacy support
ehci1 at pci0 dev 6 function 1 "NVIDIA MCP79 USB" rev 0xb1: apic 1 int 5
usb1 at ehci1: USB revision 2.0
uhub1 at usb1 configuration 1 interface 0 "NVIDIA EHCI root hub" rev 2.00/1.00
addr 1
azalia0 at pci0 dev 8 function 0 "NVIDIA MCP79 HD Audio" rev 0xb1: apic 1 int 15
azalia0: codecs: Cirrus Logic CS4206
audio0 at azalia0
ppb0 at pci0 dev 9 function 0 "NVIDIA MCP79 PCIE" rev 0xb1
pci1 at ppb0 bus 1
nfe0 at pci0 dev 10 function 0 "NVIDIA MCP79 LAN" rev 0xb1: apic 1 int 14,
address 34:15:9e:19:63:74
rgephy0 at nfe0 phy 1: RTL8169S/8110S/8211 PHY, rev. 2
pciide0 at pci0 dev 11 function 0 "NVIDIA MCP79 SATA" rev 0xb1: DMA
pciide0: using apic 1 int 11 for native-PCI interrupt
wd0 at pciide0 channel 0 drive 0: <WDC WD1600BEVT-11ZCT0>
wd0: 16-sector PIO, LBA48, 152627MB, 312581808 sectors
wd0(pciide0:0:0): using PIO mode 4, Ultra-DMA mode 6
wd1 at pciide0 channel 1 drive 0: <WDC WD10JPVT-26A1YT0>
wd1: 16-sector PIO, LBA48, 953869MB, 1953525168 sectors
wd1(pciide0:1:0): using PIO mode 4, Ultra-DMA mode 6
ppb1 at pci0 dev 16 function 0 "NVIDIA MCP79 PCIE" rev 0xb1
pci2 at ppb1 bus 2
vga1 at pci2 dev 0 function 0 "NVIDIA GeForce 9400m" rev 0xb1
wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
ppb2 at pci0 dev 21 function 0 "NVIDIA MCP79 PCIE" rev 0xb1: msi
pci3 at ppb2 bus 3
"Broadcom BCM4322" rev 0x01 at pci3 dev 0 function 0 not configured
ppb3 at pci0 dev 22 function 0 "NVIDIA MCP79 PCIE" rev 0xb1: msi
pci4 at ppb3 bus 4
"AT&T/Lucent FW643 1394" rev 0x07 at pci4 dev 0 function 0 not configured
isa0 at pcib0
isadma0 at isa0
pcppi0 at isa0 port 0x61
spkr0 at pcppi0
usb2 at ohci0: USB revision 1.0
uhub2 at usb2 configuration 1 interface 0 "NVIDIA OHCI root hub" rev 1.00/1.00
addr 1
usb3 at ohci1: USB revision 1.0
uhub3 at usb3 configuration 1 interface 0 "NVIDIA OHCI root hub" rev 1.00/1.00
addr 1
vmm0 at mainbus0: VMX (using slow L1TF mitigation)
uvideo0 at uhub0 port 4 configuration 1 interface 0 "Apple Inc. Built-in
iSight" rev 2.00/4.19 addr 2
video0 at uvideo0
ugen0 at uhub0 port 4 configuration 1 "Apple Inc. Built-in iSight" rev
2.00/4.19 addr 2
umass0 at uhub1 port 5 configuration 1 interface 0 "Apple Card Reader" rev
2.00/98.33 addr 2
umass0: using SCSI over Bulk-Only
scsibus1 at umass0: 2 targets, initiator 0
sd0 at scsibus1 targ 1 lun 0: <APPLE, SD Card Reader, 1.00> removable
serial.05ac8403000000009833
uhidev0 at uhub2 port 1 configuration 1 interface 0 "Logitech USB Receiver" rev
2.00/12.10 addr 2
uhidev0: iclass 3/1
ukbd0 at uhidev0: 8 variable keys, 6 key codes
wskbd0 at ukbd0: console keyboard, using wsdisplay0
uhidev1 at uhub2 port 1 configuration 1 interface 1 "Logitech USB Receiver" rev
2.00/12.10 addr 2
uhidev1: iclass 3/1, 8 report ids
ums0 at uhidev1 reportid 2: 16 buttons, Z and W dir
wsmouse0 at ums0 mux 0
uhid0 at uhidev1 reportid 3: input=4, output=0, feature=0
uhid1 at uhidev1 reportid 4: input=1, output=0, feature=0
uhid2 at uhidev1 reportid 8: input=1, output=0, feature=0
uhidev2 at uhub2 port 1 configuration 1 interface 2 "Logitech USB Receiver" rev
2.00/12.10 addr 2
uhidev2: iclass 3/0, 33 report ids
uhid3 at uhidev2 reportid 16: input=6, output=6, feature=0
uhid4 at uhidev2 reportid 17: input=19, output=19, feature=0
uhid5 at uhidev2 reportid 32: input=14, output=14, feature=0
uhid6 at uhidev2 reportid 33: input=31, output=31, feature=0
uhidev3 at uhub2 port 5 configuration 1 interface 0 "Apple Computer, Inc. IR
Receiver" rev 2.00/0.16 addr 3
uhidev3: iclass 3/0, 38 report ids
uhid7 at uhidev3 reportid 36: input=4, output=0, feature=0
uhid8 at uhidev3 reportid 37: input=4, output=0, feature=0
uhid9 at uhidev3 reportid 38: input=4, output=0, feature=0
uhidev4 at uhub2 port 6 configuration 1 interface 0 "Apple Inc. Apple Internal
Keyboard / Trackpad" rev 2.00/0.81 addr 4
uhidev4: iclass 3/1, 9 report ids
ukbd1 at uhidev4 reportid 1: 8 variable keys, 6 key codes, country code 13
wskbd1 at ukbd1 mux 1
wskbd1: connecting to wsdisplay0
uhid10 at uhidev4 reportid 9: input=0, output=0, feature=3
uhidev5 at uhub2 port 6 configuration 1 interface 1 "Apple Inc. Apple Internal
Keyboard / Trackpad" rev 2.00/0.81 addr 4
uhidev5: iclass 3/0, 68 report ids
uhid11 at uhidev5 reportid 68: input=511, output=0, feature=0
ubcmtp0 at uhub2 port 6 configuration 1 interface 2 "Apple Inc. Apple Internal
Keyboard / Trackpad" rev 2.00/0.81 addr 4
wsmouse1 at ubcmtp0 mux 0
uhub4 at uhub3 port 1 configuration 1 interface 0 "Apple Inc. BRCM2046 Hub" rev
2.00/1.00 addr 2
ugen1 at uhub4 port 1 "Apple Inc. Bluetooth USB Host Controller" rev 2.00/2.08
addr 3
uhidev6 at uhub4 port 2 configuration 1 interface 0 "Apple Computer product
0x820a" rev 2.00/1.00 addr 4
uhidev6: iclass 3/1, 1 report id
ukbd2 at uhidev6 reportid 1: 8 variable keys, 6 key codes
wskbd2 at ukbd2 mux 1
wskbd2: connecting to wsdisplay0
uhidev7 at uhub4 port 3 configuration 1 interface 0 "Apple Computer product
0x820b" rev 2.00/1.00 addr 5
uhidev7: iclass 3/1, 2 report ids
ums1 at uhidev7 reportid 2: 3 buttons
wsmouse2 at ums1 mux 0
vscsi0 at root
scsibus2 at vscsi0: 256 targets
softraid0 at root
scsibus3 at softraid0: 256 targets
root on wd0a (277c3553370b8fa8.a) swap on wd0b dump on wd0b
