vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Launch ion

Browse source
This commit is contained in:
Jeremy Soller 2016-09-20 21:56:40 -06:00
parent e110ab81b8
commit 1a3a24c8bb
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -125,10 +125,6 @@ $(BUILD)/libstd.rlib: libstd/Cargo.toml libstd/src/** $(BUILD)/libcore.rlib $(BU
$(CARGO) rustc --verbose --manifest-path $< $(CARGOFLAGS) -o $@ $(CARGO) rustc --verbose --manifest-path $< $(CARGOFLAGS) -o $@
cp libstd/target/$(TARGET)/debug/deps/*.rlib $(BUILD) cp libstd/target/$(TARGET)/debug/deps/*.rlib $(BUILD)
$(BUILD)/ion: ion/Cargo.toml ion/src/*.rs $(BUILD)/libstd.rlib
$(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@
strip $@
initfs/bin/init: init/Cargo.toml init/src/*.rs $(BUILD)/libstd.rlib initfs/bin/init: init/Cargo.toml init/src/*.rs $(BUILD)/libstd.rlib
mkdir -p initfs/bin mkdir -p initfs/bin
$(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@
@ -147,13 +143,19 @@ initfs/bin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib
strip $@ strip $@
rm $@.d rm $@.d
initfs/bin/ion: ion/Cargo.toml ion/src/*.rs $(BUILD)/libstd.rlib
mkdir -p initfs/bin
$(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@
strip $@
rm $@.d
$(BUILD)/initfs.rs: \ $(BUILD)/initfs.rs: \
initfs/bin/init \ initfs/bin/init \
initfs/bin/pcid \ initfs/bin/pcid \
initfs/bin/ps2d \ initfs/bin/ps2d \
initfs/bin/vesad \ initfs/bin/vesad \
initfs/bin/example initfs/bin/example \
initfs/bin/ion
echo 'use collections::BTreeMap;' > $@ echo 'use collections::BTreeMap;' > $@
echo 'pub fn gen() -> BTreeMap<&'"'"'static [u8], &'"'"'static [u8]> {' >> $@ echo 'pub fn gen() -> BTreeMap<&'"'"'static [u8], &'"'"'static [u8]> {' >> $@
echo ' let mut files: BTreeMap<&'"'"'static [u8], &'"'"'static [u8]> = BTreeMap::new();' >> $@ echo ' let mut files: BTreeMap<&'"'"'static [u8], &'"'"'static [u8]> = BTreeMap::new();' >> $@

3
drivers/vesad/src/main.rs
View file

@ -33,8 +33,9 @@ fn main() {
} }
if physbaseptr > 0 { if physbaseptr > 0 {
let mut socket = File::create(":display").expect("vesad: failed to create display scheme");
thread::spawn(move || { thread::spawn(move || {
let mut socket = File::create(":display").expect("vesad: failed to create display scheme");
let size = width * height; let size = width * height;
let onscreen = unsafe { physmap(physbaseptr as usize, size * 4, MAP_WRITE | MAP_WRITE_COMBINE).expect("vesad: failed to map VBE LFB") }; let onscreen = unsafe { physmap(physbaseptr as usize, size * 4, MAP_WRITE | MAP_WRITE_COMBINE).expect("vesad: failed to map VBE LFB") };