Browse files

pee cee eye

  • Loading branch information...
1 parent 71316fe commit ca251621bb053fd89b46ae6f7c6c222aeda28473 @wolfwood wolfwood committed Jun 5, 2012
Showing with 20 additions and 10 deletions.
  1. +4 −2 app/d/init/filelist.d
  2. +6 −0 build.sh
  3. +2 −0 build/bochsrc
  4. +2 −2 kernel/core/kmain.d
  5. +6 −6 kernel/dev/pci.d
View
6 app/d/init/filelist.d
@@ -4,10 +4,12 @@ void fileList(){
EmbeddedFS.makeFile!("binaries/xsh")();
EmbeddedFS.makeFile!("binaries/nm")();
EmbeddedFS.makeFile!("binaries/hello")();
+ EmbeddedFS.makeFile!("binaries/dynhello")();
EmbeddedFS.makeFile!("binaries/chel")();
- EmbeddedFS.makeFile!("binaries/simplymm")();
+ EmbeddedFS.makeFile!("binaries/lspci")();
+// EmbeddedFS.makeFile!("binaries/simplymm")();
EmbeddedFS.makeFile!("binaries/posix")();
- EmbeddedFS.makeFile!("binaries/gcc")();
+// EmbeddedFS.makeFile!("binaries/gcc")();
EmbeddedFS.makeFile!("binaries/strings")();
EmbeddedFS.makeFile!("LICENSE")();
}
View
6 build.sh
@@ -31,6 +31,12 @@ rm dsss.last
dsss build || exit
cd ../../..
+cd app/d/dynhello
+dsss clean
+rm dsss.last
+dsss build || exit
+cd ../../..
+
cd app/d/posix
dsss clean
rm dsss.last
View
2 build/bochsrc
@@ -9,3 +9,5 @@ cpu: count=4, reset_on_triple_fault=0
# debug
magic_break: enabled=1
debug_symbols: file=xomb.sym
+
+ata2-master: type=disk, path=10M.sample, cylinders=306, heads=4, spt=17
View
4 kernel/core/kmain.d
@@ -115,8 +115,8 @@ extern(C) void kmain(int bootLoaderID, void *data) {
Log.result(Keyboard.initialize());
Log.print("PCI: initialize()");
- Log.result(ErrorVal.Fail);
- //Log.result(PCI.initialize());
+ //Log.result(ErrorVal.Fail);
+ Log.result(PCI.initialize());
// 7. Schedule
//Scheduler.initialize();
View
12 kernel/dev/pci.d
@@ -244,14 +244,14 @@ struct PCIBridge {
return read16(PCI.BridgeOffset.MemoryBase);
}
- uint prefetchableMemoryLimit() {
- return cast(uint)read16(PCI.BridgeOffset.PrefetchableMemoryLimit)
- | (read32(PCI.BridgeOffset.PrefetchableLimitUpper32) << 32);
+ ulong prefetchableMemoryLimit() {
+ return cast(ulong)read16(PCI.BridgeOffset.PrefetchableMemoryLimit)
+ | (cast(ulong)read32(PCI.BridgeOffset.PrefetchableLimitUpper32) << 32);
}
- uint prefetchableMemoryBase() {
- return cast(uint)read16(PCI.BridgeOffset.PrefetchableMemoryBase)
- | (read32(PCI.BridgeOffset.PrefetchableBaseUpper32) << 32);
+ ulong prefetchableMemoryBase() {
+ return cast(ulong)read16(PCI.BridgeOffset.PrefetchableMemoryBase)
+ | (cast(ulong)read32(PCI.BridgeOffset.PrefetchableBaseUpper32) << 32);
}
uint expansionRomBaseAddress() {

0 comments on commit ca25162

Please sign in to comment.