mirror of https://github.com/vinc/moros.git
Compare commits
5 Commits
b5b8f5f311
...
f225132e41
Author | SHA1 | Date |
---|---|---|
Vincent Ollivier | f225132e41 | |
Vincent Ollivier | 31066b084c | |
Vincent Ollivier | 2e15bcaa0b | |
Vincent Ollivier | 6747e7eb13 | |
Vincent Ollivier | 271927a630 |
9
Makefile
9
Makefile
|
@ -11,13 +11,14 @@ memory = 32
|
|||
output = video# video, serial
|
||||
keyboard = qwerty# qwerty, azerty, dvorak
|
||||
mode = release
|
||||
trace = false# e1000
|
||||
|
||||
# Emulation options
|
||||
nic = rtl8139# rtl8139, pcnet, e1000
|
||||
audio = sdl# sdl, coreaudio
|
||||
signal = off# on
|
||||
kvm = false
|
||||
pcap = false
|
||||
trace = false# e1000
|
||||
monitor = false
|
||||
|
||||
export MOROS_VERSION = $(shell git describe --tags | sed "s/^v//")
|
||||
|
@ -78,7 +79,8 @@ ifeq ($(monitor),true)
|
|||
endif
|
||||
|
||||
ifeq ($(output),serial)
|
||||
qemu-opts += -display none -chardev stdio,id=s0 -serial chardev:s0
|
||||
qemu-opts += -display none
|
||||
qemu-opts += -chardev stdio,id=s0,signal=$(signal) -serial chardev:s0
|
||||
endif
|
||||
|
||||
ifeq ($(mode),debug)
|
||||
|
@ -98,7 +100,8 @@ qemu:
|
|||
|
||||
test:
|
||||
cargo test --release --lib --no-default-features --features serial -- \
|
||||
-m $(memory) -display none -serial stdio -device isa-debug-exit,iobase=0xF4,iosize=0x04
|
||||
-m $(memory) -display none -serial stdio \
|
||||
-device isa-debug-exit,iobase=0xF4,iosize=0x04
|
||||
|
||||
website:
|
||||
cd www && sh build.sh
|
||||
|
|
|
@ -32,6 +32,10 @@
|
|||
- [x] CPU: AMD Athlon II Dual Core
|
||||
- [ ] NIC: HP NC107i
|
||||
|
||||
- [x] Lenovo ThinkCentre M83 SFF (2014)
|
||||
- [x] CPU: Intel Pentium G3220
|
||||
- [x] NIC: Intel I217-LM
|
||||
|
||||
- [x] Intel NUC 5CPYH (2015)
|
||||
- [x] CPU: Intel Celeron N3050
|
||||
- [ ] NIC: Realtek RTL8111HN
|
||||
|
|
|
@ -88,7 +88,7 @@ const IO_ADDR: u16 = 0x00;
|
|||
const IO_DATA: u16 = 0x04;
|
||||
|
||||
// NOTE: Must be a multiple of 8
|
||||
const RX_BUFFERS_COUNT: usize = 8;
|
||||
const RX_BUFFERS_COUNT: usize = 64;
|
||||
const TX_BUFFERS_COUNT: usize = 8;
|
||||
|
||||
// NOTE: Must be equals
|
||||
|
|
|
@ -51,6 +51,12 @@
|
|||
<li>[x] CPU: AMD Athlon II Dual Core</li>
|
||||
<li>[ ] NIC: HP NC107i</li>
|
||||
</ul></li>
|
||||
<li><p>[x] Lenovo ThinkCentre M83 SFF (2014)</p>
|
||||
|
||||
<ul>
|
||||
<li>[x] CPU: Intel Pentium G3220</li>
|
||||
<li>[x] NIC: Intel I217-LM</li>
|
||||
</ul></li>
|
||||
<li><p>[x] Intel NUC 5CPYH (2015)</p>
|
||||
|
||||
<ul>
|
||||
|
|
Loading…
Reference in New Issue