diff --git a/README.md b/README.md index 9c881711d..e585dcc78 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,17 @@ -# DragonOS +
+ dragonos-logo
+

打造完全自主可控的数字化未来！

+ + [![Static Badge](https://img.shields.io/badge/%E5%AE%98%E7%BD%91-DragonOS.org-4c69e4)](https://dragonos.org) + [![Static Badge](https://img.shields.io/badge/社区-dragonos.zulipchat.com-9561e8)](https://dragonos.zulipchat.com) -## 打造完全自主可控的数字化未来！ --- +
+ +# DragonOS + **Languages** 中文|[English](README_EN.md)   @@ -24,9 +32,9 @@ - **了解开发动态、开发任务，请访问DragonOS的zulip社群**： [https://DragonOS.zulipchat.com](https://DragonOS.zulipchat.com) -- 开源论坛 **[bbs.DragonOS.org](https://bbs.dragonos.org)** - - 软件镜像站 **[mirrors.DragonOS.org](https://mirrors.DragonOS.org)** +- Git镜像站 **[git.mirrors.DragonOS.org](https://git.mirrors.DragonOS.org)** +- 国内镜像站 **[mirrors.DragonOS.org.cn](https://mirrors.DragonOS.org.cn)** - 开发交流QQ群 **115763565** @@ -40,8 +48,6 @@ - [构建DragonOS — DragonOS dev 文档](https://docs.dragonos.org/zh_CN/latest/introduction/build_system.html) -- [教你在15分钟内运行DragonOS！- Bilibili](https://www.bilibili.com/video/BV1zF411w7s2?share_source=copy_web&vd_source=41ab4a1b73e6f65219a785923511517e) - ## 系统特性   请参见文档：[系统特性](https://docs.dragonos.org/zh_CN/latest/introduction/features.html) @@ -58,7 +64,7 @@   或者是加入我们的开发交流QQ群：**115763565** -  对于正式问题的讨论，我们建议在 **[DragonOS的zulip社群](https://DragonOS.zulipchat.com)** 上的对应板块，使用正式的语言发帖讨论。亦或者是在本仓库的issue下提出问题。 +  对于正式问题的讨论，请在 **[DragonOS的zulip社群](https://DragonOS.zulipchat.com)** 上的对应板块，使用正式的语言发帖讨论。亦或者是在本仓库的issue下提出问题。 ## 贡献者名单 diff --git a/README_EN.md b/README_EN.md index c4ab5b76e..7dc4211d4 100644 --- a/README_EN.md +++ b/README_EN.md @@ -13,8 +13,8 @@ - Home Page **[DragonOS.org](https://dragonos.org)** - Documentation **[docs.DragonOS.org](https://docs.dragonos.org)** - **To learn about development dynamics and development tasks, please visit DragonOS's zulip community:** [https://DragonOS.zulipchat.com](https://DragonOS.zulipchat.com) -- BBS **[bbs.DragonOS.org](https://bbs.dragonos.org)** - Software mirror website **[mirrors.DragonOS.org](https://mirrors.DragonOS.org)** +- Git mirror website **[git.mirrors.DragonOS.org](https://git.mirrors.DragonOS.org)** - QQ group **115763565** - Code search engine [code.DragonOS.org](http://code.dragonos.org)  @@ -24,8 +24,6 @@ - [Building DragonOS - DragonOS dev document](https://docs.dragonos.org/zh_CN/latest/introduction/build_system.html) -- [Teach you to run DragonOS in 15 minutes- Bilibili](https://www.bilibili.com/video/BV1zF411w7s2?share_source=copy_web&vd_source=41ab4a1b73e6f65219a785923511517e) - ## DragonOS' Features   See documentation:[Features](https://docs.dragonos.org/zh_CN/latest/introduction/features.html) diff --git a/bochsrc b/bochsrc deleted file mode 100644 index 3c6fe5e55..000000000 --- a/bochsrc +++ /dev/null @@ -1,55 +0,0 @@ -# configuration file generated by Bochs -plugin_ctrl: unmapped=1, biosdev=1, speaker=1, extfpuirq=1, parallel=1, serial=1, iodebug=1 -config_interface: textconfig -display_library: x#, options="gui_debug" -#memory: host=2048, guest=2048 -romimage: file="/usr/local/share/bochs/BIOS-bochs-latest" -vgaromimage: file="/usr/local/share/bochs/VGABIOS-lgpl-latest" -# ata0-master: type=disk, path="/data/home/longjin/code/hd.img", mode=flat - -boot: disk - -# no floppyb -ata0: enabled=1, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14 -ata0-master: type=disk, path="bin/disk.img", mode=flat -ata0-slave: type=none - -ata1-master: type=cdrom, path="DragonOS.iso", status=inserted - -ata2: enabled=0 -ata3: enabled=0 -pci: enabled=1, chipset=i440fx -vga: extension=vbe, update_freq=30 - -cpu: count=1:2:1, ips=4000000, quantum=16, model=corei7_haswell_4770, reset_on_triple_fault=1, cpuid_limit_winnt=0, ignore_bad_msrs=1, mwait_is_nop=0, msrs="msrs.def" - -cpuid: x86_64=1,level=6, mmx=1, sep=1, simd=avx512, aes=1, movbe=1, xsave=1,apic=x2apic,sha=1,movbe=1,adx=1,xsaveopt=1,avx_f16c=1,avx_fma=1,bmi=bmi2,1g_pages=1,pcid=1,fsgsbase=1,smep=1,smap=1,mwait=1,vmx=1 -cpuid: family=6, model=0x1a, stepping=5, vendor_string="GenuineIntel", brand_string="Intel(R) Core(TM) i7-4770 CPU (Haswell)" - -print_timestamps: enabled=0 -debugger_log: - -magic_break: enabled=0 -port_e9_hack: enabled=0 -private_colormap: enabled=0 -clock: sync=none, time0=local, rtc_sync=0 -# no cmosimage -# no loader -log: - -logprefix: %t%e%d -debug: action=ignore, cpu0=ignore -info: action=report -error: action=report -panic: action=ask -keyboard: type=mf, serial_delay=250, paste_delay=100000, user_shortcut=none -mouse: type=ps2, enabled=0, toggle=ctrl+mbutton -speaker: enabled=1, mode=system -parport1: enabled=1, file=none -parport2: enabled=0 -com1: enabled=1, mode=null -com2: enabled=0 -com3: enabled=0 -com4: enabled=0 - -megs: 512 - - # gdbstub: enabled=1, port=1234, text_base=0, data_base=0, bss_base=0; \ No newline at end of file diff --git a/build-scripts/kernel_build/src/bindgen/arch/x86_64.rs b/build-scripts/kernel_build/src/bindgen/arch/x86_64.rs index b6daa47f6..7f9faf23c 100644 --- a/build-scripts/kernel_build/src/bindgen/arch/x86_64.rs +++ b/build-scripts/kernel_build/src/bindgen/arch/x86_64.rs @@ -1,7 +1,5 @@ use super::BindgenArch; - - pub struct X86_64BindgenArch; impl BindgenArch for X86_64BindgenArch { diff --git a/build-scripts/kernel_build/src/utils/cargo_handler.rs b/build-scripts/kernel_build/src/utils/cargo_handler.rs index a41769e6b..876e34f37 100644 --- a/build-scripts/kernel_build/src/utils/cargo_handler.rs +++ b/build-scripts/kernel_build/src/utils/cargo_handler.rs @@ -34,9 +34,9 @@ impl CargoHandler { } /// 设置Cargo对文件更改的监听 - /// + /// /// ## Parameters - /// + /// /// - `files` - The files to set rerun build pub fn emit_rerun_if_files_changed(files: &[PathBuf]) { for f in files { diff --git a/bx_enh_dbg.ini b/bx_enh_dbg.ini deleted file mode 100644 index dc94d79a7..000000000 --- a/bx_enh_dbg.ini +++ /dev/null @@ -1,26 +0,0 @@ -# bx_enh_dbg_ini -SeeReg[0] = TRUE -SeeReg[1] = TRUE -SeeReg[2] = TRUE -SeeReg[3] = TRUE -SeeReg[4] = FALSE -SeeReg[5] = FALSE -SeeReg[6] = FALSE -SeeReg[7] = FALSE -SingleCPU = FALSE -ShowIOWindows = TRUE -ShowButtons = TRUE -SeeRegColors = TRUE -ignoreNxtT = TRUE -ignSSDisasm = TRUE -UprCase = 0 -DumpInAsciiMode = 3 -isLittleEndian = TRUE -DefaultAsmLines = 512 -DumpWSIndex = 0 -DockOrder = 0x123 -ListWidthPix[0] = 486 -ListWidthPix[1] = 663 -ListWidthPix[2] = 771 -MainWindow = 0, 0, 1291, 500 -FontName = Normal diff --git a/docs/_static/dragonos-logo.svg b/docs/_static/dragonos-logo.svg new file mode 100755 index 000000000..b98f42a00 --- /dev/null +++ b/docs/_static/dragonos-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file