From c47e4a92f0c889f14537b6b0eee06b9ce01e3e8c Mon Sep 17 00:00:00 2001 From: dekunukem Date: Tue, 10 May 2022 13:08:02 +0100 Subject: [PATCH] removed debug print, updated IBMPC firmware --- firmware/ibmpc/MDK-ARM/ibmpc.uvguix.allen | 2 +- firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.axf | Bin 733068 -> 733068 bytes .../ibmpc/MDK-ARM/ibmpc/ibmpc.build_log.htm | 4 ---- firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.hex | 4 ++-- firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.htm | 2 +- firmware/ibmpc/MDK-ARM/ibmpc/ibmpc_ibmpc.dep | 2 +- firmware/ibmpc/MDK-ARM/ibmpc/main.crf | Bin 552483 -> 552483 bytes firmware/ibmpc/MDK-ARM/ibmpc/main.o | Bin 633440 -> 633440 bytes firmware/ibmpc/Src/main.c | 2 +- user_program/usb4vc_usb_scan.py | 2 +- 10 files changed, 7 insertions(+), 11 deletions(-) diff --git a/firmware/ibmpc/MDK-ARM/ibmpc.uvguix.allen b/firmware/ibmpc/MDK-ARM/ibmpc.uvguix.allen index 29f327d..3c30f74 100644 --- a/firmware/ibmpc/MDK-ARM/ibmpc.uvguix.allen +++ b/firmware/ibmpc/MDK-ARM/ibmpc.uvguix.allen @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.axf b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.axf index 8ce2378bf5ca2426c4b37f39f7f99298e84ba6bc..71746a12096fc73cf936f265f602f09a44c76a21 100644 GIT binary patch delta 84 zcmeCVuhVm1XM=zUBkN{Ck$P!H*5--&?GyDGftU%1nSq!Eh*^P{4T#x+m;;D8w@=jP dQs`i|Ff*C1xPa@}_Uav6rb)U diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.build_log.htm b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.build_log.htm index 4f6e76f..6ce58c5 100644 --- a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.build_log.htm +++ b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.build_log.htm @@ -27,10 +27,6 @@ Project File Date: 03/28/2022

Output:

*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin' Build target 'ibmpc' -compiling helpers.c... -compiling xt_kb.c... -compiling ps2kb.c... -compiling ps2mouse.c... compiling main.c... ../Src/main.c(511): warning: #188-D: enumerated type mixed with another type HAL_GPIO_WritePin(GAMEPAD_B1_GPIO_Port, GAMEPAD_B1_Pin, !(this_gamepad_event->button_1)); diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.hex b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.hex index ae887a9..bf681cc 100644 --- a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.hex +++ b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.hex @@ -316,7 +316,7 @@ :1013A00001462948243001F05BFB3CE0012100228A :1013B00049032648FEF7FDFF35E02248202140384A :1013C000FEF7C5FE1F48CD2140380170617841709D -:1013D00080238370C6703978017145710421817151 +:1013D00080238370C6703978017145710521817150 :1013E000C5710822002105468D356C5C002C0DD09E :1013F000022C04D0012C00E00CE002D004E0815467 :1014000002E00C461C438454521CD2B2491C1029E1 @@ -756,7 +756,7 @@ :102F200069F9FEF74FFEFEF7F9FEFEF721FFFEF707 :102F30003DFFFEF765FFFEF789FF634861490160C9 :102F4000032141606149C1608160FDF741FC0028B7 -:102F500000D0FEE75C48FDF76DFC002104200191E4 +:102F500000D0FEE75C48FDF76DFC002105200191E3 :102F600000900B4622785A495AA0FFF745FC564874 :102F70007430FFF761FD00F077FAFF2501355A4EF6 :102F80006F0032462B463946104600F0A1FA324611 diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.htm b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.htm index c88b9f3..ade1880 100644 --- a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.htm +++ b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.htm @@ -3,7 +3,7 @@ Static Call Graph - [ibmpc\ibmpc.axf]

Static Call Graph for image ibmpc\ibmpc.axf

-

#<CALLGRAPH># ARM Linker, 5060750: Last Updated: Tue May 10 11:48:53 2022 +

#<CALLGRAPH># ARM Linker, 5060750: Last Updated: Tue May 10 13:07:42 2022

Maximum Stack Usage = 212 bytes + Unknown(Cycles, Untraceable Function Pointers)

Call chain for Maximum Stack Depth:

diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc_ibmpc.dep b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc_ibmpc.dep index d20b2c5..5b4bf1c 100644 --- a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc_ibmpc.dep +++ b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc_ibmpc.dep @@ -239,7 +239,7 @@ I (../Inc/shared.h)(0x61B61A00) I (../Inc/xt_kb.h)(0x626EFE9E) I (../Inc/delay_us.h)(0x617487C7) F (..\Inc\xt_kb.h)(0x626EFE9E)() -F (../Src/main.c)(0x627A430E)(--c99 -c --cpu Cortex-M0 -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32F0xx_HAL_Driver/Inc -I ../Drivers/STM32F0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F0xx/Include -I ../Drivers/CMSIS/Include -I.\RTE\_ibmpc -IC:\Users\allen\AppData\Local\Arm\Packs\ARM\CMSIS\5.6.0\CMSIS\Core\Include -IC:\Users\allen\AppData\Local\Arm\Packs\Keil\STM32F0xx_DFP\2.0.0\Drivers\CMSIS\Device\ST\STM32F0xx\Include -D__UVISION_VERSION="529" -D_RTE_ -DSTM32F072xB -DUSE_HAL_DRIVER -DSTM32F072xB -o ibmpc\main.o --omf_browse ibmpc\main.crf --depend ibmpc\main.d) +F (../Src/main.c)(0x627A557F)(--c99 -c --cpu Cortex-M0 -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32F0xx_HAL_Driver/Inc -I ../Drivers/STM32F0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F0xx/Include -I ../Drivers/CMSIS/Include -I.\RTE\_ibmpc -IC:\Users\allen\AppData\Local\Arm\Packs\ARM\CMSIS\5.6.0\CMSIS\Core\Include -IC:\Users\allen\AppData\Local\Arm\Packs\Keil\STM32F0xx_DFP\2.0.0\Drivers\CMSIS\Device\ST\STM32F0xx\Include -D__UVISION_VERSION="529" -D_RTE_ -DSTM32F072xB -DUSE_HAL_DRIVER -DSTM32F072xB -o ibmpc\main.o --omf_browse ibmpc\main.crf --depend ibmpc\main.d) I (../Inc/main.h)(0x62423606) I (../Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_hal.h)(0x5DFA0893) I (../Inc/stm32f0xx_hal_conf.h)(0x62423606) diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/main.crf b/firmware/ibmpc/MDK-ARM/ibmpc/main.crf index 561c00227d193686b25e616832932a19e142b14f..a0e7ab9473c6d4311b237c4cb7d2d6532012c230 100644 GIT binary patch delta 57 zcmZ2{M{)5T#SMB~T>n?SoXo}m1iPCpxY{ka7=f4xh?#+y1&CRJm<@>8w_9*=yiNuH DD=iSn delta 57 zcmZ2{M{)5T#SMB~TzzdXC$ljCK|r$wSGxrlBM>tIF*6Xe05K~NvjH*tb_*_!*U10? C6c5M% diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/main.o b/firmware/ibmpc/MDK-ARM/ibmpc/main.o index 2cc1c59f82fb2cc56db3bee4dc79875d71a381d3..df72a72e628e4974646ef4e0cb1d0e0efd26ac39 100644 GIT binary patch delta 89 zcmaEGMeV^AwGADNjI5hG86UF(sa*D65cQj<(}B&{%D~*pq`Awty~~#oh?#(x8Hibc hm=%cGfS7%ImoG