moved service configuration out of system.conf

Change-Id: I996c0e700b087c5130ac6480ae39e1eefa771eff
This commit is contained in:
rlfnb 2016-02-04 08:03:13 +01:00 committed by Lionel Sambuc
parent b88949904f
commit 59ca1d7542
41 changed files with 310 additions and 230 deletions

View File

@ -7,7 +7,12 @@
# #
./etc/rc.capes minix-base ./etc/rc.capes minix-base
./etc/rc.capes/BB-BONE-WTHR-01 minix-base ./etc/rc.capes/BB-BONE-WTHR-01 minix-base
./etc/system.conf.d/bmp085 minix-base
./etc/system.conf.d/gpio minix-base
./etc/system.conf.d/i2c minix-base
./etc/system.conf.d/lan8710a minix-base ./etc/system.conf.d/lan8710a minix-base
./etc/system.conf.d/sht21 minix-base
./etc/system.conf.d/tsl2550 minix-base
./etc/system.conf.d/usbd minix-base ./etc/system.conf.d/usbd minix-base
./service/bmp085 minix-base ./service/bmp085 minix-base
./service/cat24c256 minix-base ./service/cat24c256 minix-base

View File

@ -6,13 +6,22 @@
# mv out mi # mv out mi
# #
./etc/system.conf.d/3c90x minix-base ./etc/system.conf.d/3c90x minix-base
./etc/system.conf.d/amddev minix-base
./etc/system.conf.d/atl2 minix-base ./etc/system.conf.d/atl2 minix-base
./etc/system.conf.d/dec21140A minix-base ./etc/system.conf.d/dec21140A minix-base
./etc/system.conf.d/dp8390 minix-base
./etc/system.conf.d/dpeth minix-base
./etc/system.conf.d/es1370 minix-base
./etc/system.conf.d/es1371 minix-base
./etc/system.conf.d/e1000 minix-base ./etc/system.conf.d/e1000 minix-base
./etc/system.conf.d/fxp minix-base ./etc/system.conf.d/fxp minix-base
./etc/system.conf.d/lance minix-base ./etc/system.conf.d/lance minix-base
./etc/system.conf.d/printer minix-base
./etc/system.conf.d/rtl8139 minix-base ./etc/system.conf.d/rtl8139 minix-base
./etc/system.conf.d/rtl8169 minix-base ./etc/system.conf.d/rtl8169 minix-base
./etc/system.conf.d/ti1225 minix-base
./etc/system.conf.d/vbfs minix-base
./etc/system.conf.d/vbox minix-base
./etc/system.conf.d/virtio_net minix-base ./etc/system.conf.d/virtio_net minix-base
./service/3c90x minix-base ./service/3c90x minix-base
./service/acpi minix-base ./service/acpi minix-base

View File

@ -149,7 +149,11 @@
./etc/syslog.conf minix-base ./etc/syslog.conf minix-base
./etc/system.conf minix-base ./etc/system.conf minix-base
./etc/system.conf.d minix-base ./etc/system.conf.d minix-base
./etc/system.conf.d/hello minix-base
./etc/system.conf.d/inet minix-base
./etc/system.conf.d/ipc minix-base ./etc/system.conf.d/ipc minix-base
./etc/system.conf.d/lwip minix-base
./etc/system.conf.d/random minix-base
./etc/system.conf.d/usb_hub minix-base ./etc/system.conf.d/usb_hub minix-base
./etc/system.conf.d/usb_storage minix-base ./etc/system.conf.d/usb_storage minix-base
./etc/termcap minix-base ./etc/termcap minix-base

View File

@ -256,44 +256,6 @@ service floppy
; ;
}; };
service dp8390
{
system
IRQCTL # 19
DEVIO # 21
SDEVIO # 22
;
pci device 10ec:8029;
io
300:20
;
irq 9;
};
service dpeth
{
system
IRQCTL # 19
DEVIO # 21
SDEVIO # 22
;
uid 0;
};
service inet
{
uid 0;
};
service lwip
{
uid 0;
};
service random
{
};
service readclock.drv service readclock.drv
{ {
ipc ALL; ipc ALL;
@ -426,96 +388,6 @@ service hgfs
; ;
}; };
service vbfs
{
ipc
SYSTEM pm vfs rs ds vm vbox
;
vm
SETCACHEPAGE
CLEARCACHE
;
};
service printer
{
io 378:4 # LPT1
278:4 # LPT2
;
irq
7 # PRINTER_IRQ
;
system
KILL # 6
UMAP # 14
IRQCTL # 19
DEVIO # 21
VDEVIO # 23
READBIOS # 35
;
};
service es1370
{
system
UMAP # 14
IRQCTL # 19
DEVIO # 21
;
pci device 1274:5000;
};
service es1371
{
system
UMAP # 14
IRQCTL # 19
DEVIO # 21
;
pci device 1274:1371;
};
service ti1225
{
system
IRQCTL # 19
;
pci device 104c:ac1c;
};
service amddev
{
pci device 1022:1103;
system
UMAP_REMOTE # 17
;
vm
ADDDMA # 12
DELDMA # 13
GETDMA # 14
;
uid 0;
};
service osscore
{
system
PRIVCTL # 4
UMAP # 14
IRQCTL # 19
DEVIO # 21
SDEVIO # 22
;
pci class
4/1 # Multimedia / Audio device
;
ipc
SYSTEM pm rs tty ds vfs vm
pci inet lwip amddev
;
uid 0;
};
service filter service filter
{ {
ipc ipc
@ -549,20 +421,6 @@ service pckbd
priority 1; priority 1;
}; };
service hello
{
system
IRQCTL # 19
DEVIO # 21
;
ipc
SYSTEM pm rs tty ds vm vfs
pci inet lwip amddev
;
uid 0;
};
service devman service devman
{ {
uid 0; uid 0;
@ -598,54 +456,6 @@ service fb
; ;
}; };
service gpio
{
system
PRIVCTL # 4
IRQCTL # 19
PADCONF # 57
;
vm
SETCACHEPAGE
CLEARCACHE
;
irq
29 # GPIO module 1 (dm37xx)
30 # GPIO module 2 (dm37xx)
31 # GPIO module 3 (dm37xx)
32 # GPIO module 4 (dm37xx) / module 2a (am335x)
33 # GPIO module 5 (dm37xx) / module 2b (am335x)
34 # GPIO module 6 (dm37xx)
62 # GPIO module 3a (am335x)
63 # GPIO module 3b (am335x)
96 # GPIO module 0a (am335x)
97 # GPIO module 0b (am335x)
98 # GPIO module 1a (am335x)
99 # GPIO module 1b (am335x)
;
};
service i2c
{
system
PRIVCTL # 4
IRQCTL # 19
PADCONF # 57
;
irq
# DM37XX (BeagleBoard-xM)
56 # I2C module 1
57 # I2C module 2
61 # I2C module 3
# AM335X (BeagleBone)
70 # I2C module 1
71 # I2C module 2
30 # I2C module 3
;
ipc SYSTEM RS DS;
};
service cat24c256 service cat24c256
{ {
ipc SYSTEM RS DS i2c; ipc SYSTEM RS DS i2c;
@ -669,40 +479,6 @@ service tps65950
ipc SYSTEM RS DS i2c readclock.drv; ipc SYSTEM RS DS i2c readclock.drv;
}; };
service tsl2550
{
ipc SYSTEM RS DS i2c;
};
service sht21
{
ipc SYSTEM RS DS i2c;
};
service bmp085
{
ipc SYSTEM RS DS i2c;
};
service vbox
{
system
UMAP # 14
VUMAP # 18
IRQCTL # 19
DEVIO # 21
;
pci device 80ee:cafe;
ipc
SYSTEM
PM
RS
VM
pci
;
uid 0;
};
service fbd service fbd
{ {
ipc ipc

View File

@ -2,6 +2,10 @@
PROG= es1370 PROG= es1370
SRCS= es1370.c ak4531.c pci_helper.c SRCS= es1370.c ak4531.c pci_helper.c
FILES=$(PROG).conf
FILESNAME=$(PROG)
FILESDIR= /etc/system.conf.d
DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS} DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS}
LDADD+= -laudiodriver -lchardriver -lsys LDADD+= -laudiodriver -lchardriver -lsys

View File

@ -0,0 +1,10 @@
service es1370
{
system
UMAP # 14
IRQCTL # 19
DEVIO # 21
;
pci device 1274:5000;
};

View File

@ -2,6 +2,10 @@
PROG= es1371 PROG= es1371
SRCS= es1371.c AC97.c pci_helper.c wait.c sample_rate_converter.c SRCS= es1371.c AC97.c pci_helper.c wait.c sample_rate_converter.c
FILES=$(PROG).conf
FILESNAME=$(PROG)
FILESDIR= /etc/system.conf.d
DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS} DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS}
LDADD+= -laudiodriver -lchardriver -lsys LDADD+= -laudiodriver -lchardriver -lsys

View File

@ -0,0 +1,10 @@
service es1371
{
system
UMAP # 14
IRQCTL # 19
DEVIO # 21
;
pci device 1274:1371;
};

View File

@ -5,3 +5,7 @@ HERE=${.CURDIR}/arch/${MACHINE_ARCH}
.PATH: ${HERE} .PATH: ${HERE}
SRCS += omap_i2c.c omap_i2c.h omap_i2c_registers.h SRCS += omap_i2c.c omap_i2c.h omap_i2c_registers.h
FILES=$(PROG).conf
FILESNAME=$(PROG)
FILESDIR= /etc/system.conf.d

View File

@ -0,0 +1,20 @@
service i2c
{
system
PRIVCTL # 4
IRQCTL # 19
PADCONF # 57
;
irq
# DM37XX (BeagleBoard-xM)
56 # I2C module 1
57 # I2C module 2
61 # I2C module 3
# AM335X (BeagleBone)
70 # I2C module 1
71 # I2C module 2
30 # I2C module 3
;
ipc SYSTEM RS DS;
};

View File

@ -0,0 +1,7 @@
# Makefile for arch-dependent i2c code
.include <bsd.own.mk>
HERE=${.CURDIR}/arch/${MACHINE_ARCH}
.PATH: ${HERE}
SRCS += pci_i2c.c pci_i2c.h pci_i2c_register.h

View File

@ -2,6 +2,10 @@
PROG= ti1225 PROG= ti1225
SRCS= ti1225.c SRCS= ti1225.c
FILES=$(PROG).conf
FILESNAME=$(PROG)
FILESDIR= /etc/system.conf.d
DPADD+= ${LIBSYS} DPADD+= ${LIBSYS}
LDADD+= -lsys LDADD+= -lsys

View File

@ -0,0 +1,8 @@
service ti1225
{
system
IRQCTL # 19
;
pci device 104c:ac1c;
};

View File

@ -2,6 +2,10 @@
PROG= hello PROG= hello
SRCS= hello.c SRCS= hello.c
FILES=${PROG}.conf
FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d
DPADD+= ${LIBCHARDRIVER} ${LIBSYS} DPADD+= ${LIBCHARDRIVER} ${LIBSYS}
LDADD+= -lchardriver -lsys LDADD+= -lchardriver -lsys

View File

@ -0,0 +1,13 @@
service hello
{
system
IRQCTL # 19
DEVIO # 21
;
ipc
SYSTEM pm rs tty ds vm vfs
pci inet lwip amddev
;
uid 0;
};

View File

@ -2,6 +2,10 @@
PROG= amddev PROG= amddev
SRCS= amddev.c SRCS= amddev.c
FILES=$(PROG).conf
FILESNAME=$(PROG)
FILESDIR= /etc/system.conf.d
DPADD+= ${LIBSYS} DPADD+= ${LIBSYS}
LDADD+= -lsys LDADD+= -lsys

View File

@ -0,0 +1,14 @@
service amddev
{
pci device 1022:1103;
system
UMAP_REMOTE # 17
;
vm
ADDDMA # 12
DELDMA # 13
GETDMA # 14
;
uid 0;
};

View File

@ -2,6 +2,10 @@
PROG= dp8390 PROG= dp8390
SRCS= 3c503.c dp8390.c ne2000.c rtl8029.c wdeth.c SRCS= 3c503.c dp8390.c ne2000.c rtl8029.c wdeth.c
FILES=${PROG}.conf
FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d
DPADD+= ${LIBNETDRIVER} ${LIBSYS} DPADD+= ${LIBNETDRIVER} ${LIBSYS}
LDADD+= -lnetdriver -lsys LDADD+= -lnetdriver -lsys

View File

@ -0,0 +1,14 @@
service dp8390
{
system
IRQCTL # 19
DEVIO # 21
SDEVIO # 22
;
pci device 10ec:8029;
io
300:20
;
irq 9;
};

View File

@ -2,6 +2,10 @@
PROG= dpeth PROG= dpeth
SRCS= 3c501.c 3c509.c 3c503.c ne.c wd.c 8390.c devio.c netbuff.c dp.c SRCS= 3c501.c 3c509.c 3c503.c ne.c wd.c 8390.c devio.c netbuff.c dp.c
FILES=$(PROG).conf
FILESNAME=$(PROG)
FILESDIR= /etc/system.conf.d
DPADD+= ${LIBNETDRIVER} ${LIBSYS} DPADD+= ${LIBNETDRIVER} ${LIBSYS}
LDADD+= -lnetdriver -lsys LDADD+= -lnetdriver -lsys

View File

@ -0,0 +1,10 @@
service dpeth
{
system
IRQCTL # 19
DEVIO # 21
SDEVIO # 22
;
uid 0;
};

View File

@ -2,6 +2,10 @@
PROG= printer PROG= printer
SRCS= printer.c liveupdate.c SRCS= printer.c liveupdate.c
FILES=${PROG}.conf
FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d
DPADD+= ${LIBCHARDRIVER} ${LIBSYS} DPADD+= ${LIBCHARDRIVER} ${LIBSYS}
LDADD+= -lchardriver -lsys LDADD+= -lchardriver -lsys

View File

@ -0,0 +1,18 @@
service printer
{
io 378:4 # LPT1
278:4 # LPT2
;
irq
7 # PRINTER_IRQ
;
system
KILL # 6
UMAP # 14
IRQCTL # 19
DEVIO # 21
VDEVIO # 23
READBIOS # 35
;
};

View File

@ -1,6 +1,11 @@
# Makefile for the bmp085 pressure and temp sensor found on the Weather Cape. # Makefile for the bmp085 pressure and temp sensor found on the Weather Cape.
PROG= bmp085
SRCS= bmp085.c PROG= bmp085
SRCS= bmp085.c
FILES=${PROG}.conf
FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d
DPADD+= ${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} DPADD+= ${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS}
LDADD+= -li2cdriver -lchardriver -lsys -ltimers LDADD+= -li2cdriver -lchardriver -lsys -ltimers

View File

@ -0,0 +1,5 @@
service bmp085
{
ipc SYSTEM RS DS i2c;
};

View File

@ -1,6 +1,11 @@
# Makefile for the sht21 humidity and temp sensor found on the Weather Cape. # Makefile for the sht21 humidity and temp sensor found on the Weather Cape.
PROG= sht21
SRCS= sht21.c PROG= sht21
SRCS= sht21.c
FILES=${PROG}.conf
FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d
DPADD+= ${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} DPADD+= ${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS}
LDADD+= -li2cdriver -lchardriver -lsys -ltimers LDADD+= -li2cdriver -lchardriver -lsys -ltimers

View File

@ -0,0 +1,5 @@
service sht21
{
ipc SYSTEM RS DS i2c;
};

View File

@ -1,6 +1,11 @@
# Makefile for the tsl2550 ambient light sensor found on the Weather Cape. # Makefile for the tsl2550 ambient light sensor found on the Weather Cape.
PROG= tsl2550
SRCS= tsl2550.c PROG= tsl2550
SRCS= tsl2550.c
FILES=${PROG}.conf
FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d
DPADD+= ${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} DPADD+= ${LIBI2CDRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS}
LDADD+= -li2cdriver -lchardriver -lsys -ltimers LDADD+= -li2cdriver -lchardriver -lsys -ltimers

View File

@ -0,0 +1,5 @@
service tsl2550
{
ipc SYSTEM RS DS i2c;
};

View File

@ -2,6 +2,10 @@
PROG= gpio PROG= gpio
SRCS= gpio.c SRCS= gpio.c
FILES=${PROG}.conf
FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d
DPADD+= ${LIBVTREEFS} ${LIBFSDRIVER} ${LIBSYS} ${LIBGPIO} ${LIBCLKCONF} DPADD+= ${LIBVTREEFS} ${LIBFSDRIVER} ${LIBSYS} ${LIBGPIO} ${LIBCLKCONF}
LDADD+= -lvtreefs -lfsdriver -lsys -lgpio -lclkconf LDADD+= -lvtreefs -lfsdriver -lsys -lgpio -lclkconf

View File

@ -0,0 +1,28 @@
service gpio
{
system
PRIVCTL # 4
IRQCTL # 19
PADCONF # 57
;
vm
SETCACHEPAGE
CLEARCACHE
;
irq
29 # GPIO module 1 (dm37xx)
30 # GPIO module 2 (dm37xx)
31 # GPIO module 3 (dm37xx)
32 # GPIO module 4 (dm37xx) / module 2a (am335x)
33 # GPIO module 5 (dm37xx) / module 2b (am335x)
34 # GPIO module 6 (dm37xx)
62 # GPIO module 3a (am335x)
63 # GPIO module 3b (am335x)
96 # GPIO module 0a (am335x)
97 # GPIO module 0b (am335x)
98 # GPIO module 1a (am335x)
99 # GPIO module 1b (am335x)
;
};

View File

@ -2,6 +2,10 @@
PROG= random PROG= random
SRCS= main.c random.c rijndael_api.c rijndael_alg.c SRCS= main.c random.c rijndael_api.c rijndael_alg.c
FILES=$(PROG).conf
FILESNAME=$(PROG)
FILESDIR= /etc/system.conf.d
.PATH: ${.CURDIR}/aes .PATH: ${.CURDIR}/aes
DPADD+= ${LIBCHARDRIVER} ${LIBSYS} DPADD+= ${LIBCHARDRIVER} ${LIBSYS}

View File

@ -0,0 +1,4 @@
service random
{
};

View File

@ -2,6 +2,10 @@
PROG= vbox PROG= vbox
SRCS= vbox.c hgcm.c err.c SRCS= vbox.c hgcm.c err.c
FILES=${PROG}.conf
FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d
DPADD+= ${LIBSYS} DPADD+= ${LIBSYS}
LDADD+= -lsys LDADD+= -lsys

View File

@ -0,0 +1,19 @@
service vbox
{
system
UMAP # 14
VUMAP # 18
IRQCTL # 19
DEVIO # 21
;
pci device 80ee:cafe;
ipc
SYSTEM
PM
RS
VM
pci
;
uid 0;
};

View File

@ -3,6 +3,10 @@ PROG= vbfs
SRCS= vbfs.c SRCS= vbfs.c
MAN= vbfs.8 MAN= vbfs.8
FILES=$(PROG).conf
FILESNAME=$(PROG)
FILESDIR= /etc/system.conf.d
DPADD+= ${LIBSFFS} ${LIBVBOXFS} ${LIBFSDRIVER} ${LIBSYS} DPADD+= ${LIBSFFS} ${LIBVBOXFS} ${LIBFSDRIVER} ${LIBSYS}
LDADD+= -lsffs -lvboxfs -lfsdriver -lsys LDADD+= -lsffs -lvboxfs -lfsdriver -lsys

11
minix/fs/vbfs/vbfs.conf Normal file
View File

@ -0,0 +1,11 @@
service vbfs
{
ipc
SYSTEM pm vfs rs ds vm vbox
;
vm
SETCACHEPAGE
CLEARCACHE
;
};

View File

@ -11,6 +11,10 @@ SRCS= buf.c clock.c inet.c inet_config.c \
queryparam.c version.c queryparam.c version.c
MAN= inet.8 MAN= inet.8
FILES=$(PROG).conf
FILESNAME=$(PROG)
FILESDIR= /etc/system.conf.d
.PATH: ${.CURDIR}/generic .PATH: ${.CURDIR}/generic
DPADD+= ${LIBCHARDRIVER} ${LIBSYS} DPADD+= ${LIBCHARDRIVER} ${LIBSYS}

5
minix/net/inet/inet.conf Normal file
View File

@ -0,0 +1,5 @@
service inet
{
uid 0;
};

View File

@ -10,6 +10,10 @@ SRCS= lwip.c \
inet_config.c \ inet_config.c \
eth.c eth.c
FILES=$(PROG).conf
FILESNAME=$(PROG)
FILESDIR= /etc/system.conf.d
.PATH: ${.CURDIR}/generic .PATH: ${.CURDIR}/generic
DPADD+= ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} ${LIBLWIP} ${LIBNETSOCK} DPADD+= ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} ${LIBLWIP} ${LIBNETSOCK}

5
minix/net/lwip/lwip.conf Normal file
View File

@ -0,0 +1,5 @@
service inet
{
uid 0;
};