From 87d3a32b3d5caeb21be6b3a0bb6806b8b843ff05 Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 27 Oct 2022 03:11:01 +0800 Subject: [PATCH] commit utralib mods --- utralib/Cargo.lock | 6 +- utralib/src/generated/precursor_c809403.rs | 108 ++++++++++++++------- 2 files changed, 75 insertions(+), 39 deletions(-) diff --git a/utralib/Cargo.lock b/utralib/Cargo.lock index 342c106c0..e630b1008 100644 --- a/utralib/Cargo.lock +++ b/utralib/Cargo.lock @@ -25,9 +25,9 @@ dependencies = [ [[package]] name = "svd2utra" -version = "0.1.1" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "febce5fedefca45dd6d3596751bd1b55b968eb633539badd1bda52d21bc62e09" +checksum = "44806cf793ccbc923e20f935536d7f96b7fb2d3de283becfaffaae90b7087417" dependencies = [ "convert_case", "quick-xml", @@ -35,7 +35,7 @@ dependencies = [ [[package]] name = "utralib" -version = "0.1.3" +version = "0.1.8" dependencies = [ "svd2utra", ] diff --git a/utralib/src/generated/precursor_c809403.rs b/utralib/src/generated/precursor_c809403.rs index 0ca4cdc94..a2beca6b0 100644 --- a/utralib/src/generated/precursor_c809403.rs +++ b/utralib/src/generated/precursor_c809403.rs @@ -2228,7 +2228,8 @@ mod tests { #[test] #[ignore] fn compile_check_reboot_csr() { - use super::*; let mut reboot_csr = CSR::new(HW_REBOOT_BASE as *mut u32); + use super::*; + let mut reboot_csr = CSR::new(HW_REBOOT_BASE as *mut u32); let foo = reboot_csr.r(utra::reboot::SOC_RESET); reboot_csr.wo(utra::reboot::SOC_RESET, foo); @@ -2258,7 +2259,8 @@ mod tests { #[test] #[ignore] fn compile_check_timer0_csr() { - use super::*; let mut timer0_csr = CSR::new(HW_TIMER0_BASE as *mut u32); + use super::*; + let mut timer0_csr = CSR::new(HW_TIMER0_BASE as *mut u32); let foo = timer0_csr.r(utra::timer0::LOAD); timer0_csr.wo(utra::timer0::LOAD, foo); @@ -2312,7 +2314,8 @@ mod tests { #[test] #[ignore] fn compile_check_crg_csr() { - use super::*; let mut crg_csr = CSR::new(HW_CRG_BASE as *mut u32); + use super::*; + let mut crg_csr = CSR::new(HW_CRG_BASE as *mut u32); let foo = crg_csr.r(utra::crg::MMCM_DRP_RESET); crg_csr.wo(utra::crg::MMCM_DRP_RESET, foo); @@ -2382,7 +2385,8 @@ mod tests { #[test] #[ignore] fn compile_check_gpio_csr() { - use super::*; let mut gpio_csr = CSR::new(HW_GPIO_BASE as *mut u32); + use super::*; + let mut gpio_csr = CSR::new(HW_GPIO_BASE as *mut u32); let foo = gpio_csr.r(utra::gpio::OUTPUT); gpio_csr.wo(utra::gpio::OUTPUT, foo); @@ -2578,7 +2582,8 @@ mod tests { #[test] #[ignore] fn compile_check_uart_csr() { - use super::*; let mut uart_csr = CSR::new(HW_UART_BASE as *mut u32); + use super::*; + let mut uart_csr = CSR::new(HW_UART_BASE as *mut u32); let foo = uart_csr.r(utra::uart::RXTX); uart_csr.wo(utra::uart::RXTX, foo); @@ -2663,7 +2668,8 @@ mod tests { #[test] #[ignore] fn compile_check_console_csr() { - use super::*; let mut console_csr = CSR::new(HW_CONSOLE_BASE as *mut u32); + use super::*; + let mut console_csr = CSR::new(HW_CONSOLE_BASE as *mut u32); let foo = console_csr.r(utra::console::RXTX); console_csr.wo(utra::console::RXTX, foo); @@ -2748,7 +2754,8 @@ mod tests { #[test] #[ignore] fn compile_check_app_uart_csr() { - use super::*; let mut app_uart_csr = CSR::new(HW_APP_UART_BASE as *mut u32); + use super::*; + let mut app_uart_csr = CSR::new(HW_APP_UART_BASE as *mut u32); let foo = app_uart_csr.r(utra::app_uart::RXTX); app_uart_csr.wo(utra::app_uart::RXTX, foo); @@ -2833,7 +2840,8 @@ mod tests { #[test] #[ignore] fn compile_check_info_csr() { - use super::*; let mut info_csr = CSR::new(HW_INFO_BASE as *mut u32); + use super::*; + let mut info_csr = CSR::new(HW_INFO_BASE as *mut u32); let foo = info_csr.r(utra::info::DNA_ID1); info_csr.wo(utra::info::DNA_ID1, foo); @@ -2935,7 +2943,8 @@ mod tests { #[test] #[ignore] fn compile_check_sram_ext_csr() { - use super::*; let mut sram_ext_csr = CSR::new(HW_SRAM_EXT_BASE as *mut u32); + use super::*; + let mut sram_ext_csr = CSR::new(HW_SRAM_EXT_BASE as *mut u32); let foo = sram_ext_csr.r(utra::sram_ext::CONFIG_STATUS); sram_ext_csr.wo(utra::sram_ext::CONFIG_STATUS, foo); @@ -2957,7 +2966,8 @@ mod tests { #[test] #[ignore] fn compile_check_memlcd_csr() { - use super::*; let mut memlcd_csr = CSR::new(HW_MEMLCD_BASE as *mut u32); + use super::*; + let mut memlcd_csr = CSR::new(HW_MEMLCD_BASE as *mut u32); let foo = memlcd_csr.r(utra::memlcd::COMMAND); memlcd_csr.wo(utra::memlcd::COMMAND, foo); @@ -3032,7 +3042,8 @@ mod tests { #[test] #[ignore] fn compile_check_com_csr() { - use super::*; let mut com_csr = CSR::new(HW_COM_BASE as *mut u32); + use super::*; + let mut com_csr = CSR::new(HW_COM_BASE as *mut u32); let foo = com_csr.r(utra::com::TX); com_csr.wo(utra::com::TX, foo); @@ -3119,7 +3130,8 @@ mod tests { #[test] #[ignore] fn compile_check_i2c_csr() { - use super::*; let mut i2c_csr = CSR::new(HW_I2C_BASE as *mut u32); + use super::*; + let mut i2c_csr = CSR::new(HW_I2C_BASE as *mut u32); let foo = i2c_csr.r(utra::i2c::PRESCALE); i2c_csr.wo(utra::i2c::PRESCALE, foo); @@ -3285,7 +3297,8 @@ mod tests { #[test] #[ignore] fn compile_check_btevents_csr() { - use super::*; let mut btevents_csr = CSR::new(HW_BTEVENTS_BASE as *mut u32); + use super::*; + let mut btevents_csr = CSR::new(HW_BTEVENTS_BASE as *mut u32); let foo = btevents_csr.r(utra::btevents::EV_STATUS); btevents_csr.wo(utra::btevents::EV_STATUS, foo); @@ -3330,7 +3343,8 @@ mod tests { #[test] #[ignore] fn compile_check_messible_csr() { - use super::*; let mut messible_csr = CSR::new(HW_MESSIBLE_BASE as *mut u32); + use super::*; + let mut messible_csr = CSR::new(HW_MESSIBLE_BASE as *mut u32); let foo = messible_csr.r(utra::messible::IN); messible_csr.wo(utra::messible::IN, foo); @@ -3365,7 +3379,8 @@ mod tests { #[test] #[ignore] fn compile_check_messible2_csr() { - use super::*; let mut messible2_csr = CSR::new(HW_MESSIBLE2_BASE as *mut u32); + use super::*; + let mut messible2_csr = CSR::new(HW_MESSIBLE2_BASE as *mut u32); let foo = messible2_csr.r(utra::messible2::IN); messible2_csr.wo(utra::messible2::IN, foo); @@ -3400,7 +3415,8 @@ mod tests { #[test] #[ignore] fn compile_check_ticktimer_csr() { - use super::*; let mut ticktimer_csr = CSR::new(HW_TICKTIMER_BASE as *mut u32); + use super::*; + let mut ticktimer_csr = CSR::new(HW_TICKTIMER_BASE as *mut u32); let foo = ticktimer_csr.r(utra::ticktimer::CONTROL); ticktimer_csr.wo(utra::ticktimer::CONTROL, foo); @@ -3470,7 +3486,8 @@ mod tests { #[test] #[ignore] fn compile_check_susres_csr() { - use super::*; let mut susres_csr = CSR::new(HW_SUSRES_BASE as *mut u32); + use super::*; + let mut susres_csr = CSR::new(HW_SUSRES_BASE as *mut u32); let foo = susres_csr.r(utra::susres::CONTROL); susres_csr.wo(utra::susres::CONTROL, foo); @@ -3590,7 +3607,8 @@ mod tests { #[test] #[ignore] fn compile_check_power_csr() { - use super::*; let mut power_csr = CSR::new(HW_POWER_BASE as *mut u32); + use super::*; + let mut power_csr = CSR::new(HW_POWER_BASE as *mut u32); let foo = power_csr.r(utra::power::POWER); power_csr.wo(utra::power::POWER, foo); @@ -3788,7 +3806,8 @@ mod tests { #[test] #[ignore] fn compile_check_spinor_soft_int_csr() { - use super::*; let mut spinor_soft_int_csr = CSR::new(HW_SPINOR_SOFT_INT_BASE as *mut u32); + use super::*; + let mut spinor_soft_int_csr = CSR::new(HW_SPINOR_SOFT_INT_BASE as *mut u32); let foo = spinor_soft_int_csr.r(utra::spinor_soft_int::EV_STATUS); spinor_soft_int_csr.wo(utra::spinor_soft_int::EV_STATUS, foo); @@ -3826,7 +3845,8 @@ mod tests { #[test] #[ignore] fn compile_check_spinor_csr() { - use super::*; let mut spinor_csr = CSR::new(HW_SPINOR_BASE as *mut u32); + use super::*; + let mut spinor_csr = CSR::new(HW_SPINOR_BASE as *mut u32); let foo = spinor_csr.r(utra::spinor::CONFIG); spinor_csr.wo(utra::spinor::CONFIG, foo); @@ -3976,7 +3996,8 @@ mod tests { #[test] #[ignore] fn compile_check_keyboard_csr() { - use super::*; let mut keyboard_csr = CSR::new(HW_KEYBOARD_BASE as *mut u32); + use super::*; + let mut keyboard_csr = CSR::new(HW_KEYBOARD_BASE as *mut u32); let foo = keyboard_csr.r(utra::keyboard::UART_CHAR); keyboard_csr.wo(utra::keyboard::UART_CHAR, foo); @@ -4106,7 +4127,8 @@ mod tests { #[test] #[ignore] fn compile_check_keyinject_csr() { - use super::*; let mut keyinject_csr = CSR::new(HW_KEYINJECT_BASE as *mut u32); + use super::*; + let mut keyinject_csr = CSR::new(HW_KEYINJECT_BASE as *mut u32); let foo = keyinject_csr.r(utra::keyinject::UART_CHAR); keyinject_csr.wo(utra::keyinject::UART_CHAR, foo); @@ -4128,7 +4150,8 @@ mod tests { #[test] #[ignore] fn compile_check_seed_csr() { - use super::*; let mut seed_csr = CSR::new(HW_SEED_BASE as *mut u32); + use super::*; + let mut seed_csr = CSR::new(HW_SEED_BASE as *mut u32); let foo = seed_csr.r(utra::seed::SEED1); seed_csr.wo(utra::seed::SEED1, foo); @@ -4150,7 +4173,8 @@ mod tests { #[test] #[ignore] fn compile_check_keyrom_csr() { - use super::*; let mut keyrom_csr = CSR::new(HW_KEYROM_BASE as *mut u32); + use super::*; + let mut keyrom_csr = CSR::new(HW_KEYROM_BASE as *mut u32); let foo = keyrom_csr.r(utra::keyrom::ADDRESS); keyrom_csr.wo(utra::keyrom::ADDRESS, foo); @@ -4188,7 +4212,8 @@ mod tests { #[test] #[ignore] fn compile_check_audio_csr() { - use super::*; let mut audio_csr = CSR::new(HW_AUDIO_BASE as *mut u32); + use super::*; + let mut audio_csr = CSR::new(HW_AUDIO_BASE as *mut u32); let foo = audio_csr.r(utra::audio::EV_STATUS); audio_csr.wo(utra::audio::EV_STATUS, foo); @@ -4416,7 +4441,8 @@ mod tests { #[test] #[ignore] fn compile_check_trng_kernel_csr() { - use super::*; let mut trng_kernel_csr = CSR::new(HW_TRNG_KERNEL_BASE as *mut u32); + use super::*; + let mut trng_kernel_csr = CSR::new(HW_TRNG_KERNEL_BASE as *mut u32); let foo = trng_kernel_csr.r(utra::trng_kernel::STATUS); trng_kernel_csr.wo(utra::trng_kernel::STATUS, foo); @@ -4508,7 +4534,8 @@ mod tests { #[test] #[ignore] fn compile_check_trng_server_csr() { - use super::*; let mut trng_server_csr = CSR::new(HW_TRNG_SERVER_BASE as *mut u32); + use super::*; + let mut trng_server_csr = CSR::new(HW_TRNG_SERVER_BASE as *mut u32); let foo = trng_server_csr.r(utra::trng_server::CONTROL); trng_server_csr.wo(utra::trng_server::CONTROL, foo); @@ -5288,7 +5315,8 @@ mod tests { #[test] #[ignore] fn compile_check_trng_csr() { - use super::*; let mut trng_csr = CSR::new(HW_TRNG_BASE as *mut u32); + use super::*; + let mut trng_csr = CSR::new(HW_TRNG_BASE as *mut u32); let foo = trng_csr.r(utra::trng::XADC_TEMPERATURE); trng_csr.wo(utra::trng::XADC_TEMPERATURE, foo); @@ -5454,7 +5482,8 @@ mod tests { #[test] #[ignore] fn compile_check_sha512_csr() { - use super::*; let mut sha512_csr = CSR::new(HW_SHA512_BASE as *mut u32); + use super::*; + let mut sha512_csr = CSR::new(HW_SHA512_BASE as *mut u32); let foo = sha512_csr.r(utra::sha512::POWER); sha512_csr.wo(utra::sha512::POWER, foo); @@ -5750,7 +5779,8 @@ mod tests { #[test] #[ignore] fn compile_check_engine_csr() { - use super::*; let mut engine_csr = CSR::new(HW_ENGINE_BASE as *mut u32); + use super::*; + let mut engine_csr = CSR::new(HW_ENGINE_BASE as *mut u32); let foo = engine_csr.r(utra::engine::WINDOW); engine_csr.wo(utra::engine::WINDOW, foo); @@ -5904,7 +5934,8 @@ mod tests { #[test] #[ignore] fn compile_check_jtag_csr() { - use super::*; let mut jtag_csr = CSR::new(HW_JTAG_BASE as *mut u32); + use super::*; + let mut jtag_csr = CSR::new(HW_JTAG_BASE as *mut u32); let foo = jtag_csr.r(utra::jtag::NEXT); jtag_csr.wo(utra::jtag::NEXT, foo); @@ -5936,7 +5967,8 @@ mod tests { #[test] #[ignore] fn compile_check_wdt_csr() { - use super::*; let mut wdt_csr = CSR::new(HW_WDT_BASE as *mut u32); + use super::*; + let mut wdt_csr = CSR::new(HW_WDT_BASE as *mut u32); let foo = wdt_csr.r(utra::wdt::WATCHDOG); wdt_csr.wo(utra::wdt::WATCHDOG, foo); @@ -5986,7 +6018,8 @@ mod tests { #[test] #[ignore] fn compile_check_usbdev_csr() { - use super::*; let mut usbdev_csr = CSR::new(HW_USBDEV_BASE as *mut u32); + use super::*; + let mut usbdev_csr = CSR::new(HW_USBDEV_BASE as *mut u32); let foo = usbdev_csr.r(utra::usbdev::USBDISABLE); usbdev_csr.wo(utra::usbdev::USBDISABLE, foo); @@ -6037,7 +6070,8 @@ mod tests { #[test] #[ignore] fn compile_check_d11ctime_csr() { - use super::*; let mut d11ctime_csr = CSR::new(HW_D11CTIME_BASE as *mut u32); + use super::*; + let mut d11ctime_csr = CSR::new(HW_D11CTIME_BASE as *mut u32); let foo = d11ctime_csr.r(utra::d11ctime::CONTROL); d11ctime_csr.wo(utra::d11ctime::CONTROL, foo); @@ -6059,7 +6093,8 @@ mod tests { #[test] #[ignore] fn compile_check_wfi_csr() { - use super::*; let mut wfi_csr = CSR::new(HW_WFI_BASE as *mut u32); + use super::*; + let mut wfi_csr = CSR::new(HW_WFI_BASE as *mut u32); let foo = wfi_csr.r(utra::wfi::WFI); wfi_csr.wo(utra::wfi::WFI, foo); @@ -6081,7 +6116,8 @@ mod tests { #[test] #[ignore] fn compile_check_identifier_mem_csr() { - use super::*; let mut identifier_mem_csr = CSR::new(HW_IDENTIFIER_MEM_BASE as *mut u32); + use super::*; + let mut identifier_mem_csr = CSR::new(HW_IDENTIFIER_MEM_BASE as *mut u32); let foo = identifier_mem_csr.r(utra::identifier_mem::IDENTIFIER_MEM); identifier_mem_csr.wo(utra::identifier_mem::IDENTIFIER_MEM, foo);