817d666068
Same disease as the network stack, one subsystem over. kernel/dev/vga.c
was three things wearing one name: the owner of the framebuffer, a
bitmap drawing library, and the text console. Only the first is a
driver, and because they shared a file they shared a prefix -- so
panic.c drew the crash screen with vga_fill_rect, console.c printed with
vga_putc, /dev/fb0 handed out vga_fb_phys, and every one of those files
named a display driver it had no business knowing about.
Split three ways:
- kernel/drivers/gpu/vga/vga_fb.c owns the VBE framebuffer -- the mode
the loader programmed and handed over, the aperture, and the display
class vtable. It is a driver and now lives with the driver that
finds the card on the bus.
- kernel/dev/gfx.c draws: pixels, shapes, glyphs, the cursor, scroll,
the ANSI erase operations. It names no driver. The framebuffer
arrives through gfx_attach_scanout(), so a driver publishes what it
owns and this file draws on it without knowing what it is.
- include/gfx.h is the interface, and says why it is deliberately not
the display class: that one is about frames -- acquire, present,
vblank -- and the crash screen has to work when nothing else does.
main() no longer calls a display driver. platform_register_devices()
takes the framebuffer address and brings up whatever owns it, which is
where driver names belong; kernel/drivers/registry.c is the file whose
entire job is naming every driver in the kernel.
virtio-gpu got the e1000 treatment as well: instances in an array, the
instance hung on dev->priv by an `attached` hook, and every op reading
it rather than a file-static. It refused the second adapter outright
before, which is not hypothetical -- integrated plus discrete is an
ordinary laptop. The VGA driver deliberately has no such hook, and says
so: there is one framebuffer the loader programmed however many
VGA-class controllers the bus turns up, and a second one publishing the
same scanout is the truth rather than a bug.
Private headers moved next to their drivers: include/virtio.h and
include/xhci.h each had exactly one includer. include/ is for headers
the rest of the kernel needs.
Deleted rather than moved: consoleinit() programmed the sixteen ANSI
colours into the VGA DAC and disabled text-mode blink, by writing ports
0x3C0-0x3C9 from the console. The comment three lines above the colour
table already said this does nothing in a 32bpp linear mode -- there is
no palette to index -- so it was both dead and in the wrong file.
Verified, and this is a refactor so the evidence is that nothing moved:
- bootcheck -Fb -Net: 59 [ok], no failures. That covers the console
through every command, /dev/fb0's geometry, writing pixels through
write() and mapping the framebuffer through mmap.
- make crashshot: the crash screen renders exactly as before --
shapes, glyphs, logo and QR code -- which is the whole of gfx.c
exercised at once, in a panic, with the scanout attached by a driver.
- make schcom-test: five pixel assertions from the host oracle still
pass, so the display class and the compositor above it are unmoved.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
149 lines
No EOL
4.8 KiB
C
149 lines
No EOL
4.8 KiB
C
#pragma once
|
|
#ifndef USER_H
|
|
#define USER_H
|
|
|
|
#include "types.h"
|
|
#include "date.h"
|
|
|
|
struct stat;
|
|
struct rtcdate;
|
|
struct mouse_data;
|
|
|
|
// --- system calls ---
|
|
int fork(void);
|
|
void exit(void) __attribute__((noreturn));
|
|
int wait(void);
|
|
int pipe(int*);
|
|
int write(int, void*, int);
|
|
int read(int, void*, int);
|
|
int close(int);
|
|
int kill(int);
|
|
int exec(char*, char**);
|
|
int open(char*, int);
|
|
int mknod(char*, short, short);
|
|
int unlink(char*);
|
|
int fstat(int fd, struct stat*);
|
|
int link(char*, char*);
|
|
int mkdir(char*);
|
|
int chdir(char*);
|
|
int dup(int);
|
|
int dup2(int, int);
|
|
int fcntl(int, int, int);
|
|
long lseek(int, long, int);
|
|
int getpid(void);
|
|
char* sbrk(uint64);
|
|
int sleep(int);
|
|
int uptime(void);
|
|
int vga_sync(void*); // legacy no-op syscall; the name is ABI, not this layer
|
|
int getmouse(struct mouse_data*);
|
|
int reboot(void);
|
|
int shutdown(void);
|
|
int sigfillset(sigset_t *set);
|
|
int sigprocmask(int how, const sigset_t *set, sigset_t *oldset);
|
|
int sigwait(const sigset_t *set, int *sig);
|
|
int alarm(int seconds);
|
|
int waitpid(int pid, int *status, int options);
|
|
int setsid(void);
|
|
void* mmap(void*, uint64, int, int, int, uint64);
|
|
// Shared memory. shmat returns the attach address, or a small negative value
|
|
// on failure — there is no errno in this runtime, so check for < 0.
|
|
int shmget(int key, uint64 size, int flags);
|
|
void* shmat(int id, void *addr, int flags);
|
|
int shmdt(void *addr);
|
|
int munmap(void*, uint64);
|
|
int delete(char*);
|
|
int show(char*);
|
|
int showstat(char*, struct stat*);
|
|
int ftruncate(int, int);
|
|
int truncate(char*, int);
|
|
int rename(const char*, const char*);
|
|
int symlink(char*, char*);
|
|
int readlink(char*, char*, int);
|
|
int getuid(void);
|
|
int geteuid(void);
|
|
int nanosleep(void*);
|
|
int mprotect(void*, uint64, int);
|
|
int ioctl(int, uint64, void*);
|
|
|
|
// Attributes on a file, and the index over them. Only SchFS carries these;
|
|
// anything else answers EOPNOTSUPP.
|
|
//
|
|
// schfs_query returns how many object ids it wrote, or -1 if the attribute has
|
|
// no index -- it will not fall back to walking the filesystem, because a query
|
|
// that silently becomes a full scan is worse than one that says it cannot help.
|
|
int setxattr(const char *path, const char *name, const void *val, int size,
|
|
int flags);
|
|
int getxattr(const char *path, const char *name, void *val, int size);
|
|
int removexattr(const char *path, const char *name);
|
|
int schfs_index(const char *name);
|
|
int schfs_query(const char *name, const char *value,
|
|
unsigned long long *out, int cap);
|
|
char* getcwd(char*, int);
|
|
int arch_prctl(int, uint64);
|
|
int set_tid_address(int*);
|
|
int set_robust_list(void*, int);
|
|
int futex(int*, int, int, void*, int*, int);
|
|
int clone(uint64, void*, void*, void*, void*);
|
|
void exit_group(int) __attribute__((noreturn));
|
|
int wait4(int, int*, int, void*);
|
|
int getgid(void);
|
|
int getegid(void);
|
|
int umask(int);
|
|
int writev(int, void*, int);
|
|
int readv(int, void*, int);
|
|
void* brk(void*);
|
|
int prlimit(int, int, void*, void*);
|
|
int lstat(const char*, struct stat*);
|
|
int access(const char*, int);
|
|
int openat(int, const char*, int, ...);
|
|
int fchdir(int);
|
|
int enable_linux_abi(void);
|
|
int getrlimit(int, void*);
|
|
int setuid(int);
|
|
int setgid(int);
|
|
int getsid(int);
|
|
int dup3(int, int, int);
|
|
int pipe2(int*, int);
|
|
int clock_gettime(int, void*);
|
|
int getppid(void);
|
|
int rt_sigaction(int, void*, void*, uint64);
|
|
int mount(const char *src, const char *tgt, const char *fstype, uint64 flags, void *data);
|
|
|
|
// Directory reading. The kernel has had getdents64 since the Linux ABI landed,
|
|
// but nothing declared it here, so first-party programs had no way to list a
|
|
// directory at all -- which is what schinit needs to find its job files.
|
|
//
|
|
// Records are packed: step by d_reclen, never by sizeof, because d_name is a
|
|
// flexible array and each record is only as long as its name needs.
|
|
struct dirent64 {
|
|
uint64 d_ino;
|
|
int64 d_off;
|
|
ushort d_reclen;
|
|
uchar d_type;
|
|
char d_name[];
|
|
};
|
|
#define DT_DIR 4
|
|
#define DT_REG 8
|
|
|
|
int getdents64(int fd, void *buf, int count);
|
|
|
|
// Sockets. `struct sockaddr` and the AF_*/SOCK_* constants are in socket.h;
|
|
// include it as well as this header to use them.
|
|
struct sockaddr;
|
|
int socket(int domain, int type, int protocol);
|
|
int bind(int fd, const struct sockaddr *addr, int addrlen);
|
|
int listen(int fd, int backlog);
|
|
int accept(int fd, struct sockaddr *addr, int *addrlen);
|
|
int connect(int fd, const struct sockaddr *addr, int addrlen);
|
|
int socketpair(int domain, int type, int protocol, int sv[2]);
|
|
int sendto(int fd, const void *buf, int len, int flags, const struct sockaddr*, int);
|
|
int recvfrom(int fd, void *buf, int len, int flags, struct sockaddr*, int*);
|
|
int sockshutdown(int fd, int how);
|
|
int setsockopt(int fd, int level, int opt, const void *val, int len);
|
|
int getsockopt(int fd, int level, int opt, void *val, int *len);
|
|
|
|
// --- ulib.c ---
|
|
int stat(const char*, struct stat*);
|
|
char* gets(char*, int max);
|
|
|
|
#endif // USER_H
|