Move shared headers in common/include
Headers that will be shared between old includes and NetBSD-like includes are moved into common/include tree. They are still copied in /usr/include in 'make includes', so compilation and programs aren't be affected.
This commit is contained in:
Gianluca Guida
@@ -2,9 +2,8 @@
|
||||
|
||||
INCSDIR= /usr/include/sys
|
||||
|
||||
INCS= asynchio.h dir.h file.h ioc_cmos.h ioc_disk.h \
|
||||
ioc_file.h ioc_memory.h ioc_scsi.h ioc_sound.h ioc_tape.h \
|
||||
ioctl.h ioc_tty.h ipc.h jmp_buf.h kbdio.h mman.h \
|
||||
INCS= asynchio.h dir.h file.h \
|
||||
ioctl.h ipc.h jmp_buf.h kbdio.h mman.h \
|
||||
mount.h mtio.h param.h ptrace.h queue.h resource.h \
|
||||
select.h sem.h shm.h sigcontext.h signal.h socket.h \
|
||||
soundcard.h statfs.h statvfs.h stat.h svrctl.h timeb.h \
|
||||
@@ -12,4 +11,7 @@ INCS= asynchio.h dir.h file.h ioc_cmos.h ioc_disk.h \
|
||||
utsname.h video.h vm.h wait.h cdefs.h null.h poll.h \
|
||||
elf32.h elf64.h elf_common.h elf_generic.h
|
||||
|
||||
.include "../../common/include/sys/Makefile.inc"
|
||||
.include "../../common/include/sys/Makefile.mount.inc"
|
||||
|
||||
.include <bsd.kinc.mk>
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
/* sys/ioc_cmos.h - CMOS ioctl() command codes.
|
||||
*/
|
||||
|
||||
#ifndef _S_I_CMOS_H
|
||||
#define _S_I_CMOS_H
|
||||
|
||||
#include <minix/ioctl.h>
|
||||
|
||||
#define CIOCGETTIME _IOR('c', 1, struct tm)
|
||||
#define CIOCGETTIMEY2K _IOR('c', 2, struct tm)
|
||||
#define CIOCSETTIME _IOW('c', 3, u32_t)
|
||||
#define CIOCSETTIMEY2K _IOW('c', 4, u32_t)
|
||||
|
||||
#endif /* _S_I_CMOS_H */
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
/* sys/ioc_disk.h - Disk ioctl() command codes. Author: Kees J. Bot
|
||||
* 23 Nov 2002
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _S_I_DISK_H
|
||||
#define _S_I_DISK_H
|
||||
|
||||
#include <minix/ioctl.h>
|
||||
|
||||
#define DIOCSETP _IOW('d', 3, struct partition)
|
||||
#define DIOCGETP _IOR('d', 4, struct partition)
|
||||
#define DIOCEJECT _IO ('d', 5)
|
||||
#define DIOCTIMEOUT _IORW('d', 6, int)
|
||||
#define DIOCOPENCT _IOR('d', 7, int)
|
||||
#define DIOCFLUSH _IO ('d', 8)
|
||||
#define DIOCSETWC _IOW('d', 9, int)
|
||||
#define DIOCGETWC _IOR('d', 10, int)
|
||||
|
||||
#endif /* _S_I_DISK_H */
|
||||
@@ -1,11 +0,0 @@
|
||||
/* sys/ioc_file.h - File ioctl() command codes.
|
||||
*/
|
||||
|
||||
#ifndef _SYS_IOC_FILE_H
|
||||
#define _SYS_IOC_FILE_H
|
||||
|
||||
#include <minix/ioctl.h>
|
||||
|
||||
#define FIONREAD _IOR('f', 1, int)
|
||||
|
||||
#endif /* _SYS_IOC_FILE_H */
|
||||
@@ -1,16 +0,0 @@
|
||||
/* sys/ioc_memory.h - Memory ioctl() command codes.
|
||||
* Author: Kees J. Bot
|
||||
* 23 Nov 2002
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _S_I_MEMORY_H
|
||||
#define _S_I_MEMORY_H
|
||||
|
||||
#include <minix/ioctl.h>
|
||||
|
||||
#define MIOCRAMSIZE _IOW('m', 3, u32_t)
|
||||
#define MIOCMAP _IOW('m', 4, struct mapreq)
|
||||
#define MIOCUNMAP _IOW('m', 5, struct mapreq)
|
||||
|
||||
#endif /* _S_I_MEMORY_H */
|
||||
@@ -1,13 +0,0 @@
|
||||
/* sys/ioc_scsi.h - SCSI ioctl() command codes. Author: Kees J. Bot
|
||||
* 23 Nov 2002
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _S_I_SCSI_H
|
||||
#define _S_I_SCSI_H
|
||||
|
||||
#include <minix/ioctl.h>
|
||||
|
||||
#define SCIOCCMD _IOW('S', 1, struct scsicmd)
|
||||
|
||||
#endif /* _S_I_SCSI_H */
|
||||
@@ -1,34 +0,0 @@
|
||||
/* sys/ioc_sound.h - Sound ioctl() command codes. Author: Kees J. Bot
|
||||
* 23 Nov 2002
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _S_I_SOUND_H
|
||||
#define _S_I_SOUND_H
|
||||
|
||||
#include <minix/ioctl.h>
|
||||
|
||||
/* Soundcard DSP ioctls. */
|
||||
#define DSPIORATE _IOW('s', 1, unsigned int)
|
||||
#define DSPIOSTEREO _IOW('s', 2, unsigned int)
|
||||
#define DSPIOSIZE _IOW('s', 3, unsigned int)
|
||||
#define DSPIOBITS _IOW('s', 4, unsigned int)
|
||||
#define DSPIOSIGN _IOW('s', 5, unsigned int)
|
||||
#define DSPIOMAX _IOR('s', 6, unsigned int)
|
||||
#define DSPIORESET _IO ('s', 7)
|
||||
#define DSPIOFREEBUF _IOR('s', 30, unsigned int)
|
||||
#define DSPIOSAMPLESINBUF _IOR('s', 31, unsigned int)
|
||||
#define DSPIOPAUSE _IO ('s', 32)
|
||||
#define DSPIORESUME _IO ('s', 33)
|
||||
|
||||
/* Soundcard mixer ioctls. */
|
||||
#define MIXIOGETVOLUME _IORW('s', 10, struct volume_level)
|
||||
#define MIXIOGETINPUTLEFT _IORW('s', 11, struct inout_ctrl)
|
||||
#define MIXIOGETINPUTRIGHT _IORW('s', 12, struct inout_ctrl)
|
||||
#define MIXIOGETOUTPUT _IORW('s', 13, struct inout_ctrl)
|
||||
#define MIXIOSETVOLUME _IORW('s', 20, struct volume_level)
|
||||
#define MIXIOSETINPUTLEFT _IORW('s', 21, struct inout_ctrl)
|
||||
#define MIXIOSETINPUTRIGHT _IORW('s', 22, struct inout_ctrl)
|
||||
#define MIXIOSETOUTPUT _IORW('s', 23, struct inout_ctrl)
|
||||
|
||||
#endif /* _S_I_SOUND_H */
|
||||
@@ -1,15 +0,0 @@
|
||||
/* sys/ioc_tape.h - Magnetic Tape ioctl() command codes.
|
||||
* Author: Kees J. Bot
|
||||
* 23 Nov 2002
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _S_I_TAPE_H
|
||||
#define _S_I_TAPE_H
|
||||
|
||||
#include <minix/ioctl.h>
|
||||
|
||||
#define MTIOCTOP _IOW('M', 1, struct mtop)
|
||||
#define MTIOCGET _IOR('M', 2, struct mtget)
|
||||
|
||||
#endif /* _S_I_TAPE_H */
|
||||
@@ -1,43 +0,0 @@
|
||||
/* sys/ioc_tty.h - Terminal ioctl() command codes.
|
||||
* Author: Kees J. Bot
|
||||
* 23 Nov 2002
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _S_I_TTY_H
|
||||
#define _S_I_TTY_H
|
||||
|
||||
#include <minix/ioctl.h>
|
||||
|
||||
/* Terminal ioctls. */
|
||||
#define TCGETS _IOR('T', 8, struct termios) /* tcgetattr */
|
||||
#define TCSETS _IOW('T', 9, struct termios) /* tcsetattr, TCSANOW */
|
||||
#define TCSETSW _IOW('T', 10, struct termios) /* tcsetattr, TCSADRAIN */
|
||||
#define TCSETSF _IOW('T', 11, struct termios) /* tcsetattr, TCSAFLUSH */
|
||||
#define TCSBRK _IOW('T', 12, int) /* tcsendbreak */
|
||||
#define TCDRAIN _IO ('T', 13) /* tcdrain */
|
||||
#define TCFLOW _IOW('T', 14, int) /* tcflow */
|
||||
#define TCFLSH _IOW('T', 15, int) /* tcflush */
|
||||
#define TIOCGWINSZ _IOR('T', 16, struct winsize)
|
||||
#define TIOCSWINSZ _IOW('T', 17, struct winsize)
|
||||
#define TIOCGPGRP _IOW('T', 18, int)
|
||||
#define TIOCSPGRP _IOW('T', 19, int)
|
||||
#define TIOCSFON_OLD _IOW('T', 20, u8_t [8192])
|
||||
#define TIOCSFON _IOW_BIG(1, u8_t [8192])
|
||||
|
||||
/* Legacy <sgtty.h> */
|
||||
#define TIOCGETP _IOR('t', 1, struct sgttyb)
|
||||
#define TIOCSETP _IOW('t', 2, struct sgttyb)
|
||||
#define TIOCGETC _IOR('t', 3, struct tchars)
|
||||
#define TIOCSETC _IOW('t', 4, struct tchars)
|
||||
|
||||
/* Keyboard ioctls. */
|
||||
#define KIOCBELL _IOW('k', 1, struct kio_bell)
|
||||
#define KIOCSLEDS _IOW('k', 2, struct kio_leds)
|
||||
#define KIOCSMAP _IOW('k', 3, keymap_t)
|
||||
|
||||
/* /dev/video ioctls. */
|
||||
#define TIOCMAPMEM _IORW('v', 1, struct mapreqvm)
|
||||
#define TIOCUNMAPMEM _IORW('v', 2, struct mapreqvm)
|
||||
|
||||
#endif /* _S_I_TTY_H */
|
||||
@@ -1,24 +0,0 @@
|
||||
/* <sys/mount.h>
|
||||
* definitions for mount(2)
|
||||
*/
|
||||
|
||||
#ifndef _MOUNT_H
|
||||
#define _MOUNT_H
|
||||
|
||||
#define MS_RDONLY 0x001 /* Mount device read only */
|
||||
#define MS_REUSE 0x002 /* Tell RS to try reusing binary from memory */
|
||||
#define MS_LABEL16 0x004 /* Mount message points to 16-byte label */
|
||||
#define MS_EXISTING 0x008 /* Tell mount to use already running server */
|
||||
|
||||
|
||||
/* Function Prototypes. */
|
||||
#ifndef _MINIX_ANSI_H
|
||||
#include <minix/ansi.h>
|
||||
#endif
|
||||
|
||||
_PROTOTYPE( int mount, (char *_spec, char *_name, int _mountflags,
|
||||
char *type, char *args) );
|
||||
_PROTOTYPE( int umount, (const char *_name) );
|
||||
_PROTOTYPE( int umount2, (const char *_name, int flags) );
|
||||
|
||||
#endif /* _MOUNT_H */
|
||||
Reference in New Issue
Block a user