Browse code Merge branch 'master' of http://Git.BrainChurts.com:8080/git/MrOlsen/UbixOS.git Conflicts: .settings/language.settings.xml src/sys/.cproject src/sys/.settings/language.settings.xml UBIXOS-1.0 master
commit 202c6c58c634a70f4635c4c68c349ca76ee62650 2 parents e8e3adb + 6f05f89 Christopher W. Olsen authored on 29 Dec 2017

Showing 55 changed files

• src/bin/init/main.c
• src/sys/armv6/exec.c
• src/sys/armv6/sched.c
• src/sys/fs/devfs/devfs.c
• src/sys/fs/ubixfs/dirCache.c
• src/sys/fs/vfs/file.c
• src/sys/i386/fork.c
• src/sys/i386/i386_exec.c
• src/sys/i386/sched.c
• src/sys/i386/spinlock.c
• src/sys/i386/sys_call.S
• src/sys/i386/sys_call_new.S
• src/sys/i386/syscall.c
• src/sys/i386/systemtask.c
• src/sys/include/net/arch/sys_arch.h
• src/sys/include/net/net.h
• src/sys/include/net/sys.h
• src/sys/include/sys/_types.h
• src/sys/include/sys/types.h
• src/sys/include/ubixos/spinlock.h
• src/sys/include/ubixos/ubthread.h
• src/sys/include/vmm/paging.h
• src/sys/include/vmm/vmm.h
• src/sys/init/main.c
• src/sys/isa/atkbd.c
• src/sys/isa/fdc.c
• src/sys/isa/ne2k.c
• src/sys/kernel/elf.c
• src/sys/kernel/gen_calls.c
• src/sys/kernel/ld.c
• src/sys/kernel/smp.c
• src/sys/kernel/syscall_new.c
• src/sys/kernel/tty.c
• src/sys/kernel/ubthread.c
• src/sys/kmods/kmod.c
• src/sys/lib/kmalloc.c
• src/sys/mpi/system.c
• src/sys/net/api/tcpip.c
• src/sys/net/core/init.c
• src/sys/net/core/mem.c
• src/sys/net/net/init.c
• src/sys/net/net/sys_arch.c
• src/sys/net/netif/ethernetif.c
• src/sys/pci/lnc.c
• src/sys/sde/main.cc
• src/sys/sys/device.c
• src/sys/vmm/copyvirtualspace.c
• src/sys/vmm/createvirtualspace.c
• src/sys/vmm/getfreepage.c
• src/sys/vmm/getfreevirtualpage.c
• src/sys/vmm/pagefault.c
• src/sys/vmm/paging.c
• src/sys/vmm/unmappage.c
• src/sys/vmm/vmm_init.c
• src/sys/vmm/vmm_memory.c

Ignore Space Show notes View src/bin/init/main.c

Ignore Space Show notes View src/sys/armv6/exec.c

Ignore Space Show notes View src/sys/armv6/sched.c

Ignore Space Show notes View src/sys/fs/devfs/devfs.c

Ignore Space Show notes View src/sys/fs/ubixfs/dirCache.c

Ignore Space Show notes View src/sys/fs/vfs/file.c

Ignore Space Show notes View src/sys/i386/fork.c

Ignore Space Show notes View src/sys/i386/i386_exec.c

Ignore Space Show notes View src/sys/i386/sched.c

Ignore Space Show notes View src/sys/i386/spinlock.c

Ignore Space Show notes View src/sys/i386/sys_call.S

Ignore Space Show notes View src/sys/i386/sys_call_new.S

Ignore Space Show notes View src/sys/i386/syscall.c

Ignore Space Show notes View src/sys/i386/systemtask.c

Ignore Space Show notes View src/sys/include/net/arch/sys_arch.h

Ignore Space Show notes View src/sys/include/net/net.h

Ignore Space Show notes View src/sys/include/net/sys.h

Ignore Space Show notes View src/sys/include/sys/_types.h

Ignore Space Show notes View src/sys/include/sys/types.h

Ignore Space Show notes View src/sys/include/ubixos/spinlock.h

Ignore Space Show notes View src/sys/include/ubixos/ubthread.h

Ignore Space Show notes View src/sys/include/vmm/paging.h

Ignore Space Show notes View src/sys/include/vmm/vmm.h

Ignore Space Show notes View src/sys/init/main.c

Ignore Space Show notes View src/sys/isa/atkbd.c

Ignore Space Show notes View src/sys/isa/fdc.c

Ignore Space Show notes View src/sys/isa/ne2k.c

Ignore Space Show notes View src/sys/kernel/elf.c

Ignore Space Show notes View src/sys/kernel/gen_calls.c

Ignore Space Show notes View src/sys/kernel/ld.c

Ignore Space Show notes View src/sys/kernel/smp.c

Ignore Space Show notes View src/sys/kernel/syscall_new.c

Ignore Space Show notes View src/sys/kernel/tty.c

Ignore Space Show notes View src/sys/kernel/ubthread.c

Ignore Space Show notes View src/sys/kmods/kmod.c

Ignore Space Show notes View src/sys/lib/kmalloc.c

Ignore Space Show notes View src/sys/mpi/system.c

Ignore Space Show notes View src/sys/net/api/tcpip.c

Ignore Space Show notes View src/sys/net/core/init.c

Ignore Space Show notes View src/sys/net/core/mem.c

Ignore Space Show notes View src/sys/net/net/init.c

Ignore Space Show notes View src/sys/net/net/sys_arch.c

Ignore Space Show notes View src/sys/net/netif/ethernetif.c

Ignore Space Show notes View src/sys/pci/lnc.c

Ignore Space Show notes View src/sys/sde/main.cc

Ignore Space Show notes View src/sys/sys/device.c

Ignore Space Show notes View src/sys/vmm/copyvirtualspace.c

Ignore Space Show notes View src/sys/vmm/createvirtualspace.c

Ignore Space Show notes View src/sys/vmm/getfreepage.c

Ignore Space Show notes View src/sys/vmm/getfreevirtualpage.c

Ignore Space Show notes View src/sys/vmm/pagefault.c

Ignore Space Show notes View src/sys/vmm/paging.c

Ignore Space Show notes View src/sys/vmm/unmappage.c

Ignore Space Show notes View src/sys/vmm/vmm_init.c

Ignore Space Show notes View src/sys/vmm/vmm_memory.c

Show line notes below