include: one folder per subsystem, and includes that name it
Sixty-five headers sat side by side in include/, so `#include "irq.h"` said nothing about where irq.h was or what it belonged to, and errno.h, stat.h and fcntl.h at the top shadowed the system's for any host tool built with -I./include. They are in folders now -- arch/ core/ fs/ dev/ gfx/ net/ uapi/ (and ldls/ for the Linux driver layer) -- and every include names the folder, as Linux's do: "core/proc.h". Done mechanically and checked the hard way: the kernel built from this tree disassembles identically to the one built from the tree before it. The full image boots, and userland is the same set of programs. Paths in docs and comments follow; docs/guides/layout.md has a table of what is where, and tools/fix-includes.py rewrites old-style includes from the folders in the tree, for code written before this. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S1giNvrHTrPMPw7V6x1kQ4
This commit is contained in:
parent
0e39e711f1
commit
a1c965da1e
267 changed files with 1560 additions and 1440 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// The device model. See include/device.h for why it exists.
|
||||
// The device model. See include/dev/device.h for why it exists.
|
||||
//
|
||||
// A fixed table rather than a linked list: this is populated once during boot
|
||||
// by whichever bus found each device, and read afterwards. Nothing is removed
|
||||
|
|
@ -10,19 +10,19 @@
|
|||
// enumerates at runtime -- USB hotplug is the obvious one -- this needs a
|
||||
// spinlock, and the reader in procfs needs to take it.
|
||||
|
||||
#include "types.h"
|
||||
#include "defs.h"
|
||||
#include "param.h"
|
||||
#include "device.h"
|
||||
#include "display.h"
|
||||
#include "netdev.h"
|
||||
#include "theme.h"
|
||||
#include "text.h"
|
||||
#include "spinlock.h"
|
||||
#include "gfx.h"
|
||||
#include "pci.h"
|
||||
#include "mmu.h"
|
||||
#include "memlayout.h"
|
||||
#include "core/types.h"
|
||||
#include "core/defs.h"
|
||||
#include "core/param.h"
|
||||
#include "dev/device.h"
|
||||
#include "gfx/display.h"
|
||||
#include "dev/netdev.h"
|
||||
#include "gfx/theme.h"
|
||||
#include "gfx/text.h"
|
||||
#include "core/spinlock.h"
|
||||
#include "gfx/gfx.h"
|
||||
#include "dev/pci.h"
|
||||
#include "arch/mmu.h"
|
||||
#include "arch/memlayout.h"
|
||||
|
||||
static struct device devices[NDEVICE];
|
||||
static int ndevices;
|
||||
|
|
@ -187,7 +187,7 @@ display_present(int x, int y, int w, int h)
|
|||
|
||||
// Where this display's pixels actually end up. 0 when the driver does not say,
|
||||
// which callers must read as "assume it is the console's" -- see the comment
|
||||
// on scanout_phys in include/display.h.
|
||||
// on scanout_phys in include/gfx/display.h.
|
||||
uint64
|
||||
display_scanout_phys(void)
|
||||
{
|
||||
|
|
@ -229,7 +229,7 @@ display_wait_vblank(void)
|
|||
//
|
||||
// The second is the one worth having. It is also the one that only works
|
||||
// because the userspace driver said in advance where it was scanning out --
|
||||
// see PCIIOC_PANICFB in include/pciuser.h.
|
||||
// see PCIIOC_PANICFB in include/dev/pciuser.h.
|
||||
|
||||
// Copy the console framebuffer into a surface, with the same rules vgpud's
|
||||
// mirror uses: the overlap, centred if the surface is larger, top-left if it
|
||||
|
|
@ -546,7 +546,7 @@ text_selftest(void)
|
|||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// The network class. See include/netdev.h.
|
||||
// The network class. See include/dev/netdev.h.
|
||||
//
|
||||
// Plural where the display class is singular: a machine with two NICs is
|
||||
// ordinary, and "the network" is not a thing a stack can ask for the way a
|
||||
|
|
|
|||
Loading…
Reference in a new issue