sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

*** empty log message ***

Browse source
This commit is contained in:
Jorrit Herder 2005-05-02 14:30:04 +00:00
parent da1ea8dc45
commit ac0995259d
37 changed files with 187 additions and 489 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -7,6 +7,7 @@ usage:
@echo "Master Makefile for MINIX commands and utilities." >&2 @echo "Master Makefile for MINIX commands and utilities." >&2
@echo "Usage:" >&2 @echo "Usage:" >&2
@echo " make world # Compile everything (libraries & commands)" >&2 @echo " make world # Compile everything (libraries & commands)" >&2
@echo " make includes # Install include files from src/" >&2
@echo " make libraries # Compile and install libraries" >&2 @echo " make libraries # Compile and install libraries" >&2
@echo " make commands # Compile commands, but don't install" >&2 @echo " make commands # Compile commands, but don't install" >&2
@echo " make install # Compile and install commands" >&2 @echo " make install # Compile and install commands" >&2
@ -23,6 +24,9 @@ usage:
# 'make install' target. # 'make install' target.
world: etcfiles includes libraries commands install world: etcfiles includes libraries commands install
includes:
cd include && $(MAKE) install
libraries: libraries:
cd lib && $(MAKE) install cd lib && $(MAKE) install
@ -40,9 +44,6 @@ clean::
etcfiles:: etcfiles::
cd etc && $(MAKE) install cd etc && $(MAKE) install
includes::
cd include && $(MAKE) install
all install clean:: all install clean::
cd boot && $(MAKE) $@ cd boot && $(MAKE) $@
test ! -f commands/Makefile || { cd commands && $(MAKE) $@; } test ! -f commands/Makefile || { cd commands && $(MAKE) $@; }

7
commands/scripts/MAKEDEV.sh
View file

@ -18,7 +18,7 @@ case $#:$1 in
cat >&2 <<EOF cat >&2 <<EOF
Usage: $0 [-n] key ... Usage: $0 [-n] key ...
Where key is one of the following: Where key is one of the following:
ram mem kmem null # One of these makes all these memory devices ram mem kmem null boot random zero # One of these makes all these memory devices
fd0 fd1 ... # Floppy devices for drive 0, 1, ... fd0 fd1 ... # Floppy devices for drive 0, 1, ...
fd0p0 fd1p0 ... # Make floppy partitions fd0p[0-3], fd1p[0-3], ... fd0p0 fd1p0 ... # Make floppy partitions fd0p[0-3], fd1p[0-3], ...
c0d0 c0d1 ... # Make disks c0d0, c0d1, ... c0d0 c0d1 ... # Make disks c0d0, c0d1, ...
@ -50,7 +50,7 @@ do
esac esac
case $dev in case $dev in
ram|mem|kmem|null) ram|mem|kmem|null|boot|random|urandom|zero)
# Memory devices. # Memory devices.
# #
$e mknod ram b 1 0; $e chmod 600 ram $e mknod ram b 1 0; $e chmod 600 ram
@ -60,7 +60,8 @@ do
$e mknod boot b 1 4; $e chmod 600 ram $e mknod boot b 1 4; $e chmod 600 ram
$e mknod random c 1 5; $e chmod 644 random $e mknod random c 1 5; $e chmod 644 random
$e mknod urandom c 1 5; $e chmod 644 urandom $e mknod urandom c 1 5; $e chmod 644 urandom
$e chgrp kmem ram mem kmem null boot random urandom $e mknod zero c 1 6; $e chmod 644 zero
$e chgrp kmem ram mem kmem null boot random urandom zero
;; ;;
fd[0-3]) fd[0-3])
# Floppy disk drive n. # Floppy disk drive n.

2
commands/scripts/checkhier.sh
View file

@ -34,8 +34,6 @@ drwxr-xr-x root operator /etc
-rw-r--r-- root operator /etc/termcap -rw-r--r-- root operator /etc/termcap
-rw-r--r-- root operator /etc/ttytab -rw-r--r-- root operator /etc/ttytab
-rw-r--r-- root operator /etc/utmp -rw-r--r-- root operator /etc/utmp
dr-xr-xr-x root operator /fd0
dr-xr-xr-x root operator /fd1
dr-xr-xr-x root operator /mnt dr-xr-xr-x root operator /mnt
dr-xr-xr-x root operator /root dr-xr-xr-x root operator /root
drwxrwxrwx root operator /tmp drwxrwxrwx root operator /tmp

21
drivers/at_wini/at_wini.c
View file

@ -173,6 +173,7 @@ PRIVATE struct wini { /* main drive struct, one entry per drive */
unsigned state; /* drive state: deaf, initialized, dead */ unsigned state; /* drive state: deaf, initialized, dead */
unsigned base; /* base register of the register file */ unsigned base; /* base register of the register file */
unsigned irq; /* interrupt request line */ unsigned irq; /* interrupt request line */
int irq_hook_id; /* id of irq hook at the kernel */
unsigned lcylinders; /* logical number of cylinders (BIOS) */ unsigned lcylinders; /* logical number of cylinders (BIOS) */
unsigned lheads; /* logical number of heads */ unsigned lheads; /* logical number of heads */
unsigned lsectors; /* logical number of sectors per track */ unsigned lsectors; /* logical number of sectors per track */
@ -247,11 +248,6 @@ PUBLIC void main()
/* Register function key for debugging dumps. */ /* Register function key for debugging dumps. */
fkey_enable(SF8); fkey_enable(SF8);
#if DEAD_CODE
if ((s=get_own_proc_nr(&win_tasknr)) != OK)
server_panic(w_name(),"Couldn't get own process number",s);
#endif
printf("AT wini task started.\n");
/* Set special disk parameters then call the generic main loop. */ /* Set special disk parameters then call the generic main loop. */
init_params(); init_params();
driver_task(&w_dtab); driver_task(&w_dtab);
@ -472,13 +468,10 @@ PRIVATE int w_identify()
/* Everything looks OK; register IRQ so we can stop polling. */ /* Everything looks OK; register IRQ so we can stop polling. */
wn->irq = w_drive < 2 ? AT_WINI_0_IRQ : AT_WINI_1_IRQ; wn->irq = w_drive < 2 ? AT_WINI_0_IRQ : AT_WINI_1_IRQ;
#if DEAD_CODE if ((s=sys_irqsetpolicy(wn->irq, IRQ_REENABLE, &wn->irq_hook_id)) != OK)
sys_irqsetpolicy(w_wn->irq, (IRQ_READ_PORT | IRQ_BYTE | IRQ_REENABLE), SELF, server_panic("AT", "coudn't set IRQ policy", s);
(w_wn->base + REG_STATUS), &w_byteval, 0); if ((s=sys_irqenable(&wn->irq_hook_id)) != OK)
#else server_panic("AT", "coudn't enable IRQ line", s);
sys_irqsetpolicy(w_wn->irq, IRQ_REENABLE, SELF, 0, 0, 0);
#endif
sys_irqenable(wn->irq);
return(OK); return(OK);
} }
@ -841,11 +834,7 @@ PRIVATE void w_intr_wait()
if (m.m_type == SYN_ALARM) { /* but check for timeout */ if (m.m_type == SYN_ALARM) { /* but check for timeout */
w_timeout(); /* a.o. set w_status */ w_timeout(); /* a.o. set w_status */
} else if (m.m_type == HARD_INT) { } else if (m.m_type == HARD_INT) {
#if DEAD_CODE
w_status = w_byteval; /* read by generic handler */
#else
sys_inb((w_wn->base + REG_STATUS), &w_status); sys_inb((w_wn->base + REG_STATUS), &w_status);
#endif
} }
} }
} else { } else {

42
drivers/floppy/floppy.c
View file

@ -213,6 +213,7 @@ PRIVATE struct floppy { /* main drive struct, one entry per drive */
struct device fl_part[NR_PARTITIONS]; /* partition's base & size */ struct device fl_part[NR_PARTITIONS]; /* partition's base & size */
} floppy[NR_DRIVES]; } floppy[NR_DRIVES];
PRIVATE int irq_hook_id; /* id of irq hook at the kernel */
PRIVATE int motor_status; /* bitmap of current motor status */ PRIVATE int motor_status; /* bitmap of current motor status */
PRIVATE int need_reset; /* set to 1 when controller must be reset */ PRIVATE int need_reset; /* set to 1 when controller must be reset */
PRIVATE unsigned f_drive; /* selected drive */ PRIVATE unsigned f_drive; /* selected drive */
@ -222,9 +223,6 @@ PRIVATE struct density *f_dp; /* current density parameters */
PRIVATE struct density *prev_dp;/* previous density parameters */ PRIVATE struct density *prev_dp;/* previous density parameters */
PRIVATE unsigned f_sectors; /* equal to f_dp->secpt (needed a lot) */ PRIVATE unsigned f_sectors; /* equal to f_dp->secpt (needed a lot) */
PRIVATE u16_t f_busy; /* BSY_IDLE, BSY_IO, BSY_WAKEN */ PRIVATE u16_t f_busy; /* BSY_IDLE, BSY_IO, BSY_WAKEN */
#if DEAD_CODE
PRIVATE irq_hook_t f_hook; /* interrupt hook */
#endif
PRIVATE struct device *f_dv; /* device's base and size */ PRIVATE struct device *f_dv; /* device's base and size */
PRIVATE struct disk_parameter_s fmt_param; /* parameters for format */ PRIVATE struct disk_parameter_s fmt_param; /* parameters for format */
PRIVATE u8_t f_results[MAX_RESULTS];/* the controller can give lots of output */ PRIVATE u8_t f_results[MAX_RESULTS];/* the controller can give lots of output */
@ -253,9 +251,6 @@ FORWARD _PROTOTYPE( void start_motor, (void) );
FORWARD _PROTOTYPE( int seek, (void) ); FORWARD _PROTOTYPE( int seek, (void) );
FORWARD _PROTOTYPE( int fdc_transfer, (int opcode) ); FORWARD _PROTOTYPE( int fdc_transfer, (int opcode) );
FORWARD _PROTOTYPE( int fdc_results, (void) ); FORWARD _PROTOTYPE( int fdc_results, (void) );
#if DEAD_CODE
FORWARD _PROTOTYPE( int f_handler, (irq_hook_t *hook) );
#endif
FORWARD _PROTOTYPE( int fdc_command, (u8_t *cmd, int len) ); FORWARD _PROTOTYPE( int fdc_command, (u8_t *cmd, int len) );
FORWARD _PROTOTYPE( void fdc_out, (int val) ); FORWARD _PROTOTYPE( void fdc_out, (int val) );
FORWARD _PROTOTYPE( int recalibrate, (void) ); FORWARD _PROTOTYPE( int recalibrate, (void) );
@ -291,7 +286,7 @@ PUBLIC void main()
/* Initialize the floppy structure and the timers. */ /* Initialize the floppy structure and the timers. */
struct floppy *fp; struct floppy *fp;
int irqs; int s;
f_next_timeout = TMR_NEVER; f_next_timeout = TMR_NEVER;
tmr_inittimer(&f_tmr_timeout); tmr_inittimer(&f_tmr_timeout);
@ -304,10 +299,10 @@ PUBLIC void main()
} }
/* Set IRQ policy, only request notifications. */ /* Set IRQ policy, only request notifications. */
if ((irqs=sys_irqsetpolicy(FLOPPY_IRQ, 0, SELF, 0, 0, 0 )) != OK) if ((s=sys_irqsetpolicy(FLOPPY_IRQ, 0, &irq_hook_id )) != OK)
server_panic("FLOPPY", "Couldn't set IRQ policy", irqs); server_panic("FLOPPY", "Couldn't set IRQ policy", s);
if ((irqs=sys_irqenable(FLOPPY_IRQ)) != OK) if ((s=sys_irqenable(&irq_hook_id)) != OK)
server_panic("FLOPPY", "Couldn't enable IRQs", irqs); server_panic("FLOPPY", "Couldn't enable IRQs", s);
printf("FLOPPY: user-level floppy disk driver initialized\n"); printf("FLOPPY: user-level floppy disk driver initialized\n");
driver_task(&f_dtab); driver_task(&f_dtab);
@ -878,7 +873,6 @@ PRIVATE int fdc_results()
int s, result_nr, status; int s, result_nr, status;
static int timeout; /* must be static if not cancelled */ static int timeout; /* must be static if not cancelled */
int irqs;
/* Extract bytes from FDC until it says it has no more. The loop is /* Extract bytes from FDC until it says it has no more. The loop is
* really an outer loop on result_nr and an inner loop on status. * really an outer loop on result_nr and an inner loop on status.
@ -903,8 +897,8 @@ PRIVATE int fdc_results()
continue; continue;
} }
if (status == MASTER) { /* all read */ if (status == MASTER) { /* all read */
if ((irqs=sys_irqenable(FLOPPY_IRQ)) != OK) if ((s=sys_irqenable(&irq_hook_id)) != OK)
server_panic("FLOPPY", "Couldn't enable IRQs", irqs); server_panic("FLOPPY", "Couldn't enable IRQs", s);
/* Disabling the alarm is not needed, because a static flag /* Disabling the alarm is not needed, because a static flag
* is used and a leftover timeout cannot do any harm. It is * is used and a leftover timeout cannot do any harm. It is
@ -916,28 +910,12 @@ PRIVATE int fdc_results()
} while (! timeout); } while (! timeout);
need_reset = TRUE; /* controller chip must be reset */ need_reset = TRUE; /* controller chip must be reset */
if ((irqs=sys_irqenable(FLOPPY_IRQ)) != OK) if ((s=sys_irqenable(&irq_hook_id)) != OK)
server_panic("FLOPPY", "Couldn't enable IRQs", irqs); server_panic("FLOPPY", "Couldn't enable IRQs", s);
return(ERR_STATUS); return(ERR_STATUS);
} }
#if DEAD_CODE
/*==========================================================================*
* f_handler *
*==========================================================================*/
PRIVATE int f_handler(hook)
irq_hook_t *hook;
{
/* FDC interrupt, send message to floppy task. */
#if DEAD_CODE
f_busy = BSY_IDLE;
#endif
notify(FLOPPY, HARD_INT);
return 0;
}
#endif
/*===========================================================================* /*===========================================================================*
* fdc_command * * fdc_command *

31
drivers/libdriver/driver.c
View file

@ -96,14 +96,6 @@ struct driver *dp; /* Device dependent entry points. */
caller = mess.m_source; caller = mess.m_source;
proc_nr = mess.PROC_NR; proc_nr = mess.PROC_NR;
#if DEAD_CODE /* drivers, like TTY can have any number */
/* Check if legitimate caller: FS or a task. */
if (caller != FS_PROC_NR && caller >= 0) {
printf("%s: got message from %d\n", (*dp->dr_name)(), caller);
continue;
}
#endif
/* Now carry out the work. */ /* Now carry out the work. */
switch(mess.m_type) { switch(mess.m_type) {
case DEV_OPEN: r = (*dp->dr_open)(dp, &mess); break; case DEV_OPEN: r = (*dp->dr_open)(dp, &mess); break;
@ -234,14 +226,6 @@ message *mp; /* pointer to read or write message */
if (OK != sys_datacopy(mp->m_source, (vir_bytes) mp->ADDRESS, if (OK != sys_datacopy(mp->m_source, (vir_bytes) mp->ADDRESS,
SELF, (vir_bytes) iovec, iovec_size)) SELF, (vir_bytes) iovec, iovec_size))
server_panic((*dp->dr_name)(),"bad I/O vector by", mp->m_source); server_panic((*dp->dr_name)(),"bad I/O vector by", mp->m_source);
#if DEAD_CODE
sys_umap(mp->m_source, (vir_bytes) mp->ADDRESS,
iovec_size, &user_iovec_phys);
if (user_iovec_phys == 0)
server_panic((*dp->dr_name)(),"bad I/O vector by", mp->m_source);
iovec_phys = vir2phys(iovec);
phys_copy(user_iovec_phys, iovec_phys, (phys_bytes) iovec_size);
#endif
iov = iovec; iov = iovec;
} }
@ -255,9 +239,6 @@ message *mp; /* pointer to read or write message */
if (mp->m_source >= 0) { if (mp->m_source >= 0) {
sys_datacopy(SELF, (vir_bytes) iovec, sys_datacopy(SELF, (vir_bytes) iovec,
mp->m_source, (vir_bytes) mp->ADDRESS, iovec_size); mp->m_source, (vir_bytes) mp->ADDRESS, iovec_size);
#if DEAD_CODE
phys_copy(iovec_phys, user_iovec_phys, (phys_bytes) iovec_size);
#endif
} }
return(r); return(r);
} }
@ -387,17 +368,8 @@ message *mp; /* pointer to ioctl request */
/* Decode the message parameters. */ /* Decode the message parameters. */
if ((dv = (*dp->dr_prepare)(mp->DEVICE)) == NIL_DEV) return(ENXIO); if ((dv = (*dp->dr_prepare)(mp->DEVICE)) == NIL_DEV) return(ENXIO);
#if DEAD_CODE
sys_umap(mp->PROC_NR, D, (vir_bytes) mp->ADDRESS, sizeof(entry), &user_phys);
if (user_phys == 0) return(EFAULT);
entry_phys = vir2phys(&entry);
#endif
if (mp->REQUEST == DIOCSETP) { if (mp->REQUEST == DIOCSETP) {
/* Copy just this one partition table entry. */ /* Copy just this one partition table entry. */
#if DEAD_CODE
phys_copy(user_phys, entry_phys, (phys_bytes) sizeof(entry));
#endif
if (OK != (s=sys_datacopy(mp->PROC_NR, (vir_bytes) mp->ADDRESS, if (OK != (s=sys_datacopy(mp->PROC_NR, (vir_bytes) mp->ADDRESS,
SELF, (vir_bytes) &entry, sizeof(entry)))) SELF, (vir_bytes) &entry, sizeof(entry))))
return s; return s;
@ -408,9 +380,6 @@ message *mp; /* pointer to ioctl request */
entry.base = dv->dv_base; entry.base = dv->dv_base;
entry.size = dv->dv_size; entry.size = dv->dv_size;
(*dp->dr_geometry)(&entry); (*dp->dr_geometry)(&entry);
#if DEAD_CODE
phys_copy(entry_phys, user_phys, (phys_bytes) sizeof(entry));
#endif
if (OK != (s=sys_datacopy(SELF, (vir_bytes) &entry, if (OK != (s=sys_datacopy(SELF, (vir_bytes) &entry,
mp->PROC_NR, (vir_bytes) mp->ADDRESS, sizeof(entry)))) mp->PROC_NR, (vir_bytes) mp->ADDRESS, sizeof(entry))))
return s; return s;

21
drivers/printer/printer.c
View file

@ -97,6 +97,7 @@ PRIVATE int proc_nr; /* user requesting the printing */
PRIVATE int user_left; /* bytes of output left in user buf */ PRIVATE int user_left; /* bytes of output left in user buf */
PRIVATE vir_bytes user_vir; /* address of remainder of user buf */ PRIVATE vir_bytes user_vir; /* address of remainder of user buf */
PRIVATE int writing; /* nonzero while write is in progress */ PRIVATE int writing; /* nonzero while write is in progress */
PRIVATE int irq_hook_id; /* id of irq hook at kernel */
FORWARD _PROTOTYPE( void do_cancel, (message *m_ptr) ); FORWARD _PROTOTYPE( void do_cancel, (message *m_ptr) );
FORWARD _PROTOTYPE( void output_done, (void) ); FORWARD _PROTOTYPE( void output_done, (void) );
@ -278,21 +279,15 @@ PRIVATE void do_initialize()
if (initialized) return; if (initialized) return;
initialized = TRUE; initialized = TRUE;
#if DEAD_CODE /* Get the base port for first printer. */
/* Get the base port for first printer. This used to be done from the
* BIOS with phys_copy(0x408L, vir2phys(&port_base), 2L); but currently
* a magic number is put in place.
*/
port_base = 0x378;
#endif
sys_vircopy(SELF, BIOS_SEG, LPT1_IO_PORT_ADDR, sys_vircopy(SELF, BIOS_SEG, LPT1_IO_PORT_ADDR,
SELF, D, (vir_bytes) &port_base, LPT1_IO_PORT_SIZE); SELF, D, (vir_bytes) &port_base, LPT1_IO_PORT_SIZE);
sys_outb(port_base + 2, INIT_PRINTER); sys_outb(port_base + 2, INIT_PRINTER);
tick_delay(1); /* easily satisfies Centronics minimum */ tick_delay(1); /* easily satisfies Centronics minimum */
/* was 2 millisecs; now is ~17 millisecs */ /* was 2 millisecs; now is ~17 millisecs */
sys_outb(port_base + 2, SELECT); sys_outb(port_base + 2, SELECT);
sys_irqsetpolicy(PRINTER_IRQ, SELF, 0, 0, 0, 0); sys_irqsetpolicy(PRINTER_IRQ, 0, &irq_hook_id);
sys_irqenable(PRINTER_IRQ); sys_irqenable(&irq_hook_id);
} }
@ -338,7 +333,7 @@ PRIVATE void do_printer_output()
* interrupt status does not affect the printer. * interrupt status does not affect the printer.
*/ */
sys_outb(port_base + 2, SELECT); sys_outb(port_base + 2, SELECT);
sys_irqenable(PRINTER_IRQ); sys_irqenable(&irq_hook_id);
return; return;
} }
@ -354,7 +349,7 @@ PRIVATE void do_printer_output()
* pr_restart, since they are not synchronized with printer * pr_restart, since they are not synchronized with printer
* interrupts. It may happen after a spurious interrupt. * interrupts. It may happen after a spurious interrupt.
*/ */
sys_irqenable(PRINTER_IRQ); sys_irqenable(&irq_hook_id);
return; return;
} }
if ((status & STATUS_MASK) == NORMAL_STATUS) { if ((status & STATUS_MASK) == NORMAL_STATUS) {
@ -370,7 +365,7 @@ PRIVATE void do_printer_output()
/* Error. This would be better ignored (treat as busy). */ /* Error. This would be better ignored (treat as busy). */
done_status = status; done_status = status;
output_done(); output_done();
sys_irqenable(PRINTER_IRQ); sys_irqenable(&irq_hook_id);
return; return;
} }
} }
@ -379,7 +374,7 @@ PRIVATE void do_printer_output()
/* Finished printing chunk OK. */ /* Finished printing chunk OK. */
done_status = OK; done_status = OK;
output_done(); output_done();
sys_irqenable(PRINTER_IRQ); sys_irqenable(&irq_hook_id);
} }

8
drivers/tty/Makefile
View file

@ -46,11 +46,11 @@ a = $d/drivers.h $b/interrupt.h $b/bios.h \
$m/syslib.h $s/types.h \ $m/syslib.h $s/types.h \
$m/utils.h $m/serverassert.h $m/devio.h $m/utils.h $m/serverassert.h $m/devio.h
tty.o: $a tty.o: tty.h $a
console.o: $a console.o: tty.h $a
vidcopy.o: # nothing vidcopy.o: # nothing
keyboard.o: $a keyboard.o: tty.h $a
rs232.o: $a $i/termios.h $i/signal.h rs232.o: tty.h $a $i/termios.h $i/signal.h

5
drivers/tty/keyboard.c
View file

@ -363,6 +363,7 @@ tty_t *tp;
{ {
/* Initialize the keyboard driver. */ /* Initialize the keyboard driver. */
static int count = 0; static int count = 0;
int irq_hook_id;
int i; int i;
tp->tty_devread = kb_read; /* input function */ tp->tty_devread = kb_read; /* input function */
@ -379,9 +380,9 @@ tty_t *tp;
} }
/* Set interrupt handler and enable keyboard IRQ. */ /* Set interrupt handler and enable keyboard IRQ. */
if ((i=sys_irqsetpolicy(KEYBOARD_IRQ, IRQ_REENABLE, SELF, 0, 0, 0)) != OK) if ((i=sys_irqsetpolicy(KEYBOARD_IRQ, IRQ_REENABLE, &irq_hook_id)) != OK)
server_panic("TTY", "Couldn't set keyboard IRQ policy", i); server_panic("TTY", "Couldn't set keyboard IRQ policy", i);
if ((i=sys_irqenable(KEYBOARD_IRQ)) != OK) if ((i=sys_irqenable(&irq_hook_id)) != OK)
server_panic("TTY", "Couldn't enable keyboard IRQs", i); server_panic("TTY", "Couldn't enable keyboard IRQs", i);
} }
} }

27
drivers/tty/tty.c
View file

@ -277,6 +277,7 @@ register message *m_ptr; /* pointer to message sent to the task */
{ {
/* A process wants to read from a terminal. */ /* A process wants to read from a terminal. */
int r, status; int r, status;
phys_bytes phys_addr;
/* Check if there is already a process hanging in a read, check if the /* Check if there is already a process hanging in a read, check if the
* parameters are correct, do I/O. * parameters are correct, do I/O.
@ -286,11 +287,10 @@ register message *m_ptr; /* pointer to message sent to the task */
} else } else
if (m_ptr->COUNT <= 0) { if (m_ptr->COUNT <= 0) {
r = EINVAL; r = EINVAL;
#if DEAD_CODE /* to be replaced by check on tp->tty_instatus !!! */
} else } else
if (numap_local(m_ptr->PROC_NR, (vir_bytes) m_ptr->ADDRESS, m_ptr->COUNT) == 0) { if (sys_umap(m_ptr->PROC_NR, D, (vir_bytes) m_ptr->ADDRESS, m_ptr->COUNT,
&phys_addr) != OK) {
r = EFAULT; r = EFAULT;
#endif
} else { } else {
/* Copy information from the message to the tty struct. */ /* Copy information from the message to the tty struct. */
tp->tty_inrepcode = TASK_REPLY; tp->tty_inrepcode = TASK_REPLY;
@ -319,21 +319,15 @@ register message *m_ptr; /* pointer to message sent to the task */
} }
/* Anything waiting in the input buffer? Clear it out... */ /* Anything waiting in the input buffer? Clear it out... */
tp->tty_instatus = OK; /* start with OK, check later */
in_transfer(tp); in_transfer(tp);
/* ...then go back for more. */ /* ...then go back for more. */
if (tp->tty_instatus == OK) handle_events(tp);
handle_events(tp);
if (tp->tty_inleft == 0) if (tp->tty_inleft == 0)
return; /* already done */ return; /* already done */
/* There were no bytes in the input queue available, so either suspend /* There were no bytes in the input queue available, so either suspend
* the caller or break off the read if nonblocking. * the caller or break off the read if nonblocking.
*/ */
if (tp->tty_instatus != OK) { /* error occurred */
r = tp->tty_instatus;
tp->tty_inleft = tp->tty_incum = 0; /* cancel the read */
}
if (m_ptr->TTY_FLAGS & O_NONBLOCK) { if (m_ptr->TTY_FLAGS & O_NONBLOCK) {
r = EAGAIN; /* cancel the read */ r = EAGAIN; /* cancel the read */
tp->tty_inleft = tp->tty_incum = 0; tp->tty_inleft = tp->tty_incum = 0;
@ -355,6 +349,7 @@ register message *m_ptr; /* pointer to message sent to the task */
{ {
/* A process wants to write on a terminal. */ /* A process wants to write on a terminal. */
int r; int r;
phys_bytes phys_addr;
/* Check if there is already a process hanging in a write, check if the /* Check if there is already a process hanging in a write, check if the
* parameters are correct, do I/O. * parameters are correct, do I/O.
@ -364,11 +359,10 @@ register message *m_ptr; /* pointer to message sent to the task */
} else } else
if (m_ptr->COUNT <= 0) { if (m_ptr->COUNT <= 0) {
r = EINVAL; r = EINVAL;
#if DEAD_CODE /* to be replaced by check on tp->tty_outstatus (!!!) */
} else } else
if (numap_local(m_ptr->PROC_NR, (vir_bytes) m_ptr->ADDRESS, m_ptr->COUNT) == 0) { if (sys_umap(m_ptr->PROC_NR, D, (vir_bytes) m_ptr->ADDRESS, m_ptr->COUNT,
&phys_addr) != OK) {
r = EFAULT; r = EFAULT;
#endif
} else { } else {
/* Copy message parameters to the tty structure. */ /* Copy message parameters to the tty structure. */
tp->tty_outrepcode = TASK_REPLY; tp->tty_outrepcode = TASK_REPLY;
@ -378,18 +372,13 @@ register message *m_ptr; /* pointer to message sent to the task */
tp->tty_outleft = m_ptr->COUNT; tp->tty_outleft = m_ptr->COUNT;
/* Try to write. */ /* Try to write. */
tp->tty_outstatus = OK; /* start with OK, check later */
handle_events(tp); handle_events(tp);
if (tp->tty_outleft == 0) return; /* already done */ if (tp->tty_outleft == 0) return; /* already done */
/* None or not all the bytes could be written, so either suspend the /* None or not all the bytes could be written, so either suspend the
* caller or break off the write if nonblocking. * caller or break off the write if nonblocking.
*/ */
if (tp->tty_outstatus != OK) { /* error occurred */ if (m_ptr->TTY_FLAGS & O_NONBLOCK) { /* cancel the write */
r = tp->tty_outstatus;
tp->tty_outleft = tp->tty_outcum = 0; /* cancel the write */
}
else if (m_ptr->TTY_FLAGS & O_NONBLOCK) { /* cancel the write */
r = tp->tty_outcum > 0 ? tp->tty_outcum : EAGAIN; r = tp->tty_outcum > 0 ? tp->tty_outcum : EAGAIN;
tp->tty_outleft = tp->tty_outcum = 0; tp->tty_outleft = tp->tty_outcum = 0;
} else { } else {

2
drivers/tty/tty.h
View file

@ -51,14 +51,12 @@ typedef struct tty {
vir_bytes tty_in_vir; /* virtual address where data is to go */ vir_bytes tty_in_vir; /* virtual address where data is to go */
int tty_inleft; /* how many chars are still needed */ int tty_inleft; /* how many chars are still needed */
int tty_incum; /* # chars input so far */ int tty_incum; /* # chars input so far */
int tty_instatus; /* status of last sys_vircopy() action */
char tty_outrepcode; /* reply code, TASK_REPLY or REVIVE */ char tty_outrepcode; /* reply code, TASK_REPLY or REVIVE */
char tty_outcaller; /* process that made the call (usually FS) */ char tty_outcaller; /* process that made the call (usually FS) */
char tty_outproc; /* process that wants to write to tty */ char tty_outproc; /* process that wants to write to tty */
vir_bytes tty_out_vir; /* virtual address where data comes from */ vir_bytes tty_out_vir; /* virtual address where data comes from */
int tty_outleft; /* # chars yet to be output */ int tty_outleft; /* # chars yet to be output */
int tty_outcum; /* # chars output so far */ int tty_outcum; /* # chars output so far */
int tty_outstatus; /* status of last sys_vircopy() action */
char tty_iocaller; /* process that made the call (usually FS) */ char tty_iocaller; /* process that made the call (usually FS) */
char tty_ioproc; /* process that wants to do an ioctl */ char tty_ioproc; /* process that wants to do an ioctl */
int tty_ioreq; /* ioctl request code */ int tty_ioreq; /* ioctl request code */

17
include/minix/com.h
View file

@ -74,7 +74,7 @@
* blocking notifications are delivered. The lowest numbers go first. The * blocking notifications are delivered. The lowest numbers go first. The
* offset are used for the per-process notification bit maps. * offset are used for the per-process notification bit maps.
*/ */
#define NR_NOTIFICATIONS 5 /* max. is # bits in notify_mask_t */ #define NR_NOTIFICATIONS 5 /* number of bits in notify_mask_t */
# define NOTIFICATION 333 /* offset for notification types */ # define NOTIFICATION 333 /* offset for notification types */
# define HARD_INT NOTIFICATION + 0 /* hardware interrupt */ # define HARD_INT NOTIFICATION + 0 /* hardware interrupt */
# define SYN_ALARM NOTIFICATION + 1 /* synchronous alarm */ # define SYN_ALARM NOTIFICATION + 1 /* synchronous alarm */
@ -129,7 +129,8 @@
# define KMEM_DEV 2 /* minor device for /dev/kmem */ # define KMEM_DEV 2 /* minor device for /dev/kmem */
# define NULL_DEV 3 /* minor device for /dev/null */ # define NULL_DEV 3 /* minor device for /dev/null */
# define BOOT_DEV 4 /* minor device for /dev/boot */ # define BOOT_DEV 4 /* minor device for /dev/boot */
# define RANDOM_DEV 5 /* minor device for /dev/random */ # define RANDOM_DEV 5 /* minor device for /dev/(u)random */
# define URANDOM_DEV RANDOM_DEV
# define ZERO_DEV 6 /* minor device for /dev/zero */ # define ZERO_DEV 6 /* minor device for /dev/zero */
/* Full device numbers that are special to the boot monitor and FS. */ /* Full device numbers that are special to the boot monitor and FS. */
@ -272,18 +273,12 @@
# define IRQ_DISABLE 3 /* disable interrupts */ # define IRQ_DISABLE 3 /* disable interrupts */
#define IRQ_VECTOR m5_c2 /* irq vector */ #define IRQ_VECTOR m5_c2 /* irq vector */
#define IRQ_POLICY m5_i1 /* options for IRQCTL request */ #define IRQ_POLICY m5_i1 /* options for IRQCTL request */
# define IRQ_READ_PORT 0x001 /* read port and return value */ # define IRQ_REENABLE 0x001 /* reenable IRQ line after interrupt */
# define IRQ_WRITE_PORT 0x002 /* write given value to port */
# define IRQ_STROBE 0x010 /* write masked value back to port */
# define IRQ_ECHO_VAL 0x020 /* write value read back to port */
# define IRQ_REENABLE 0x040 /* reenable IRQ line after interrupt */
# define IRQ_BYTE 0x100 /* byte values */ # define IRQ_BYTE 0x100 /* byte values */
# define IRQ_WORD 0x200 /* word values */ # define IRQ_WORD 0x200 /* word values */
# define IRQ_LONG 0x400 /* long values */ # define IRQ_LONG 0x400 /* long values */
#define IRQ_PROC_NR m5_i2 /* process number, SELF, NONE */ #define IRQ_PROC_NR m5_i2 /* process number, SELF, NONE */
#define IRQ_PORT m5_l1 /* port to read or write */ #define IRQ_HOOK_ID m5_l3 /* id of irq hook at kernel */
#define IRQ_VIR_ADDR m5_l2 /* address to store value read */
#define IRQ_MASK_VAL m5_l3 /* value or strobe mask */
/* Names of message field and paramaters for SYS_EXIT request. */ /* Names of message field and paramaters for SYS_EXIT request. */
#define EXIT_STATUS m2_i1 /* zero for normal exit, non-zero else */ #define EXIT_STATUS m2_i1 /* zero for normal exit, non-zero else */
@ -333,7 +328,7 @@
# define GET_PROCNR 3 /* find nr of process with name */ # define GET_PROCNR 3 /* find nr of process with name */
# define GET_MONPARAMS 4 /* get monitor parameters */ # define GET_MONPARAMS 4 /* get monitor parameters */
# define GET_KENV 5 /* get kernel environment string */ # define GET_KENV 5 /* get kernel environment string */
# define GET_IRQTAB 6 /* get the IRQ table */ # define GET_IRQHOOKS 6 /* get the IRQ table */
# define GET_KMESSAGES 7 /* get kernel messages */ # define GET_KMESSAGES 7 /* get kernel messages */
# define GET_MEMCHUNKS 8 /* get base+size of mem chunks */ # define GET_MEMCHUNKS 8 /* get base+size of mem chunks */
# define GET_KADDRESSES 9 /* get various kernel addresses */ # define GET_KADDRESSES 9 /* get various kernel addresses */

16
include/minix/syslib.h
View file

@ -73,14 +73,14 @@ _PROTOTYPE(int sys_signalrm, (int proc_nr, clock_t *ticks) );
_PROTOTYPE(int sys_syncalrm, (int proc_nr, clock_t exp_time, int abs_time) ); _PROTOTYPE(int sys_syncalrm, (int proc_nr, clock_t exp_time, int abs_time) );
/* Shorthands for sys_irqctl() system call. */ /* Shorthands for sys_irqctl() system call. */
#define sys_irqdisable(irq_vec) \ #define sys_irqdisable(hook_id) \
sys_irqctl(IRQ_DISABLE, irq_vec, 0, 0, 0, 0, 0) sys_irqctl(IRQ_DISABLE, 0, 0, hook_id)
#define sys_irqenable(irq_vec) \ #define sys_irqenable(hook_id) \
sys_irqctl(IRQ_ENABLE, irq_vec, 0, 0, 0, 0, 0) sys_irqctl(IRQ_ENABLE, 0, 0, hook_id)
#define sys_irqsetpolicy(irq_vec, policy, proc_nr, port, val_ptr, mask_val) \ #define sys_irqsetpolicy(irq_vec, policy, hook_id) \
sys_irqctl(IRQ_SETPOLICY, irq_vec, policy, proc_nr, port, val_ptr, mask_val) sys_irqctl(IRQ_SETPOLICY, irq_vec, policy, hook_id)
_PROTOTYPE ( int sys_irqctl, (int request, int irq_vec, int policy, _PROTOTYPE ( int sys_irqctl, (int request, int irq_vec, int policy,
int proc_nr, long port, void *val_ptr, long mask_val) ); int *irq_hook_id) );
/* Shorthands for sys_vircopy() and sys_physcopy() system calls. */ /* Shorthands for sys_vircopy() and sys_physcopy() system calls. */
#define sys_biosin(bios_vir, dst_vir, bytes) \ #define sys_biosin(bios_vir, dst_vir, bytes) \
@ -116,7 +116,7 @@ _PROTOTYPE(int sys_kmalloc, (size_t size, phys_bytes *phys_base) );
#define sys_getproc(dst,nr) sys_getinfo(GET_PROC, dst, 0,0, nr) #define sys_getproc(dst,nr) sys_getinfo(GET_PROC, dst, 0,0, nr)
#define sys_getprocnr(dst,k,kl) sys_getinfo(GET_PROCNR, dst, 0,k,kl) #define sys_getprocnr(dst,k,kl) sys_getinfo(GET_PROCNR, dst, 0,k,kl)
#define sys_getimage(dst) sys_getinfo(GET_IMAGE, dst, 0,0,0) #define sys_getimage(dst) sys_getinfo(GET_IMAGE, dst, 0,0,0)
#define sys_getirqtab(dst) sys_getinfo(GET_IRQTAB, dst, 0,0,0) #define sys_getirqhooks(dst) sys_getinfo(GET_IRQHOOKS, dst, 0,0,0)
#define sys_getmemchunks(dst) sys_getinfo(GET_MEMCHUNKS, dst, 0,0,0) #define sys_getmemchunks(dst) sys_getinfo(GET_MEMCHUNKS, dst, 0,0,0)
#define sys_getmonparams(v,vl) sys_getinfo(GET_MONPARAMS, v,vl, 0,0) #define sys_getmonparams(v,vl) sys_getinfo(GET_MONPARAMS, v,vl, 0,0)
#define sys_getkenv(k,kl,v,vl) sys_getinfo(GET_KENV, v,vl, k,kl) #define sys_getkenv(k,kl,v,vl) sys_getinfo(GET_KENV, v,vl, k,kl)

4
kernel/Makefile
View file

@ -30,7 +30,7 @@ SYS = system/system.a
# What to make. # What to make.
kernel build: $(HEAD) $(OBJS) $(SYS) kernel build: $(HEAD) $(OBJS) $(SYS)
$(LD) $(LDFLAGS) -o $@ $(HEAD) $(OBJS) $(SYS) $(CLOCK) $(LIBS) $(LD) $(LDFLAGS) -o kernel $(HEAD) $(OBJS) $(SYS) $(CLOCK) $(LIBS)
install -S 0 $@ install -S 0 $@
$(SYS): $(SYS):
@ -164,7 +164,7 @@ system/system.a: $a $h/devio.h $h/com.h
system/system.a: proc.h protect.h system.h sendmask.h system/system.a: proc.h protect.h system.h sendmask.h
system/system.a: $s/ptrace.h $s/sigcontext.h system/system.a: $s/ptrace.h $s/sigcontext.h
system/system.a: $i/signal.h $i/unistd.h system/system.a: $i/signal.h $i/unistd.h
system/system.a: system/alarms.c system/system.a: system/clock.c
system/system.a: system/copying.c system/system.a: system/copying.c
system/system.a: system/devio.c system/system.a: system/devio.c
system/system.a: system/irqctl.c system/system.a: system/irqctl.c

BIN
kernel/build
View file

Binary file not shown.

3
kernel/const.h
View file

@ -30,6 +30,9 @@
/* How many elements in vector of virtual copy requests. */ /* How many elements in vector of virtual copy requests. */
#define VCOPY_VEC_SIZE 16 #define VCOPY_VEC_SIZE 16
/* How many IRQ hooks are there in total. */
#define NR_IRQ_HOOKS 16
/* Program stack words and masks. */ /* Program stack words and masks. */
#define INIT_PSW 0x0200 /* initial psw */ #define INIT_PSW 0x0200 /* initial psw */
#define INIT_TASK_PSW 0x1200 /* initial psw for tasks (with IOPL 1) */ #define INIT_TASK_PSW 0x1200 /* initial psw for tasks (with IOPL 1) */

4
kernel/glo.h
View file

@ -37,8 +37,8 @@ EXTERN unsigned lost_ticks; /* clock ticks counted outside the clock task */
#if (CHIP == INTEL) #if (CHIP == INTEL)
/* Interrupt related variables. */ /* Interrupt related variables. */
EXTERN struct irqtab irqtab[NR_IRQ_VECTORS]; /* table with IRQ policies */ EXTERN irq_hook_t irq_hooks[NR_IRQ_HOOKS]; /* hooks for general use */
EXTERN irq_hook_t *irq_hooks[NR_IRQ_VECTORS]; /* list of IRQ handlers */ EXTERN irq_hook_t *irq_handlers[NR_IRQ_VECTORS];/* list of IRQ handlers */
EXTERN int irq_actids[NR_IRQ_VECTORS]; /* IRQ ID bits active */ EXTERN int irq_actids[NR_IRQ_VECTORS]; /* IRQ ID bits active */
EXTERN int irq_use; /* bit map of all in-use irq's */ EXTERN int irq_use; /* bit map of all in-use irq's */

2
kernel/i8259.c
View file

@ -97,7 +97,7 @@ irq_handler_t handler;
if ((unsigned) irq >= NR_IRQ_VECTORS) if ((unsigned) irq >= NR_IRQ_VECTORS)
panic("invalid call to put_irq_handler", irq); panic("invalid call to put_irq_handler", irq);
line = &irq_hooks[irq]; line = &irq_handlers[irq];
id = 1; id = 1;
while (*line != NULL) { while (*line != NULL) {
if (hook == *line) return; /* extra initialization */ if (hook == *line) return; /* extra initialization */

10
kernel/main.c
View file

@ -27,8 +27,10 @@
#include "proc.h" #include "proc.h"
#include "sendmask.h" #include "sendmask.h"
/* Prototype declarations for PRIVATE function. */ /* Prototype declarations for PRIVATE functions. */
FORWARD _PROTOTYPE( void announce, (void)); /* display user message */ FORWARD _PROTOTYPE( void announce, (void));
FORWARD _PROTOTYPE( void shutdown, (struct timer *tp));
#define STOP_TICKS (5*HZ) /* time allowed to stop */ #define STOP_TICKS (5*HZ) /* time allowed to stop */
/*===========================================================================* /*===========================================================================*
@ -244,6 +246,7 @@ int how; /* 0 = halt, 1 = reboot, 2 = panic!, ... */
shutdown(&shutdown_timer); /* TTY isn't scheduled */ shutdown(&shutdown_timer); /* TTY isn't scheduled */
} else { } else {
kprintf("\nNotifying system services about MINIX shutdown.\n", NO_ARG); kprintf("\nNotifying system services about MINIX shutdown.\n", NO_ARG);
kprintf("Known bug: hitting a key before done will hang the monitor.\n", NO_ARG);
stop_sequence(&shutdown_timer); stop_sequence(&shutdown_timer);
} }
} }
@ -304,14 +307,13 @@ timer_t *tp;
/*==========================================================================* /*==========================================================================*
* shutdown * * shutdown *
*==========================================================================*/ *==========================================================================*/
PUBLIC void shutdown(tp) PRIVATE void shutdown(tp)
timer_t *tp; timer_t *tp;
{ {
/* This function is called from prepare_shutdown or stop_sequence to bring /* This function is called from prepare_shutdown or stop_sequence to bring
* down MINIX. How to shutdown is in the argument: RBT_REBOOT, RBT_HALT, * down MINIX. How to shutdown is in the argument: RBT_REBOOT, RBT_HALT,
* RBT_RESET. * RBT_RESET.
*/ */
int quiet, code;
static u16_t magic = STOP_MEM_CHECK; static u16_t magic = STOP_MEM_CHECK;
int how = tmr_arg(tp)->ta_int; int how = tmr_arg(tp)->ta_int;

4
kernel/misc.c
View file

@ -2,10 +2,6 @@
* panic abort MINIX due to a fatal error * panic abort MINIX due to a fatal error
* bad_assertion for debugging * bad_assertion for debugging
* bad_compare for debugging * bad_compare for debugging
*
* Changes:
* Oct 04, 2004 moved panic() to this file (Jorrit N. Herder)
* Sep 30, 2004 removed mem_init(), env_parse to lib (Jorrit N. Herder)
*/ */
#include "kernel.h" #include "kernel.h"

8
kernel/mpx386.s
View file

@ -224,9 +224,9 @@ csinit:
outb INT_CTLMASK /* disable the irq */;\ outb INT_CTLMASK /* disable the irq */;\
movb al, ENABLE ;\ movb al, ENABLE ;\
outb INT_CTL /* reenable master 8259 */;\ outb INT_CTL /* reenable master 8259 */;\
push (_irq_hooks+4*irq) /* irq_hooks[irq] */;\ push (_irq_handlers+4*irq) /* irq_handlers[irq] */;\
sti /* enable interrupts */;\ sti /* enable interrupts */;\
call _intr_handle /* intr_handle(irq_hooks[irq]) */;\ call _intr_handle /* intr_handle(irq_handlers[irq]) */;\
cli /* disable interrupts */;\ cli /* disable interrupts */;\
pop ecx ;\ pop ecx ;\
cmp (_irq_actids+4*irq), 0 /* interrupt still active? */;\ cmp (_irq_actids+4*irq), 0 /* interrupt still active? */;\
@ -280,10 +280,10 @@ _hwint07: ! Interrupt routine for irq 7 (printer)
outb INT2_CTLMASK /* disable the irq */;\ outb INT2_CTLMASK /* disable the irq */;\
movb al, ENABLE ;\ movb al, ENABLE ;\
outb INT_CTL /* reenable master 8259 */;\ outb INT_CTL /* reenable master 8259 */;\
push (_irq_hooks+4*irq) /* irq_hooks[irq] */;\ push (_irq_handlers+4*irq) /* irq_handlers[irq] */;\
outb INT2_CTL /* reenable slave 8259 */;\ outb INT2_CTL /* reenable slave 8259 */;\
sti /* enable interrupts */;\ sti /* enable interrupts */;\
call _intr_handle /* intr_handle(irq_hooks[irq]) */;\ call _intr_handle /* intr_handle(irq_handlers[irq]) */;\
cli /* disable interrupts */;\ cli /* disable interrupts */;\
pop ecx ;\ pop ecx ;\
cmp (_irq_actids+4*irq), 0 /* interrupt still active? */;\ cmp (_irq_actids+4*irq), 0 /* interrupt still active? */;\

3
kernel/pci.c
View file

@ -25,6 +25,9 @@ Created: Jan 2000 by Philip Homburg <philip@cs.vu.nl>
#define irq_mode_pci(irq) ((void)0) #define irq_mode_pci(irq) ((void)0)
#endif #endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <minix/utils.h> #include <minix/utils.h>
INIT_SERVER_ASSERT INIT_SERVER_ASSERT

31
kernel/proc.c
View file

@ -491,7 +491,6 @@ PRIVATE void sched()
PUBLIC void lock_pick_proc() PUBLIC void lock_pick_proc()
{ {
/* Safe gateway to pick_proc() for tasks. */ /* Safe gateway to pick_proc() for tasks. */
switching = TRUE; switching = TRUE;
pick_proc(); pick_proc();
switching = FALSE; switching = FALSE;
@ -504,7 +503,6 @@ PUBLIC void lock_ready(rp)
struct proc *rp; /* this process is now runnable */ struct proc *rp; /* this process is now runnable */
{ {
/* Safe gateway to ready() for tasks. */ /* Safe gateway to ready() for tasks. */
switching = TRUE; switching = TRUE;
ready(rp); ready(rp);
switching = FALSE; switching = FALSE;
@ -517,7 +515,6 @@ PUBLIC void lock_unready(rp)
struct proc *rp; /* this process is no longer runnable */ struct proc *rp; /* this process is no longer runnable */
{ {
/* Safe gateway to unready() for tasks. */ /* Safe gateway to unready() for tasks. */
switching = TRUE; switching = TRUE;
unready(rp); unready(rp);
switching = FALSE; switching = FALSE;
@ -529,7 +526,6 @@ struct proc *rp; /* this process is no longer runnable */
PUBLIC void lock_sched() PUBLIC void lock_sched()
{ {
/* Safe gateway to sched() for tasks. */ /* Safe gateway to sched() for tasks. */
switching = TRUE; switching = TRUE;
sched(); sched();
switching = FALSE; switching = FALSE;
@ -565,31 +561,4 @@ PUBLIC void unhold()
while ( (rp = held_head) != NIL_PROC); while ( (rp = held_head) != NIL_PROC);
} }
#if (CHIP == M68000)
/*==========================================================================*
* cp_mess *
*==========================================================================*/
PRIVATE void cp_mess(src, src_p, src_m, dst_p, dst_m)
int src; /* sender process */
register struct proc *src_p; /* source proc entry */
message *src_m; /* source message */
register struct proc *dst_p; /* destination proc entry */
message *dst_m; /* destination buffer */
{
/* convert virtual address to physical address */
/* The caller has already checked if all addresses are within bounds */
src_m = (message *)((char *)src_m + (((phys_bytes)src_p->p_map[D].mem_phys
- src_p->p_map[D].mem_vir) << CLICK_SHIFT));
dst_m = (message *)((char *)dst_m + (((phys_bytes)dst_p->p_map[D].mem_phys
- dst_p->p_map[D].mem_vir) << CLICK_SHIFT));
#ifdef NEEDFSTRUCOPY
phys_copy(src_m,dst_m,(phys_bytes) sizeof(message));
#else
*dst_m = *src_m;
#endif
dst_m->m_source = src;
}
#endif

3
kernel/proc.h
View file

@ -64,9 +64,6 @@ struct proc {
unsigned p_pendcount; /* count of pending and unfinished signals */ unsigned p_pendcount; /* count of pending and unfinished signals */
char p_name[PROC_NAME_LEN]; /* name of the process, including \0 */ char p_name[PROC_NAME_LEN]; /* name of the process, including \0 */
#if ENABLE_MESSAGE_STATS
int msg_unreplied[NR_TASKS+NR_PROCS];
#endif
}; };
/* Guard word for task stacks. */ /* Guard word for task stacks. */

10
kernel/proto.h
View file

@ -34,8 +34,6 @@ _PROTOTYPE( char *kstrncpy,
(char *s1, register const char *s2, register const size_t n)); (char *s1, register const char *s2, register const size_t n));
_PROTOTYPE( unsigned long kstrtoul, _PROTOTYPE( unsigned long kstrtoul,
(const char *string, char ** const end, int base) ); (const char *string, char ** const end, int base) );
/* kprintf.c */
#define NO_ARG 0 #define NO_ARG 0
#define karg(arg) (karg_t) (arg) #define karg(arg) (karg_t) (arg)
_PROTOTYPE( void kprintf, (const char *fmt, karg_t arg) ); _PROTOTYPE( void kprintf, (const char *fmt, karg_t arg) );
@ -44,7 +42,6 @@ _PROTOTYPE( void kprintf, (const char *fmt, karg_t arg) );
_PROTOTYPE( void main, (void) ); _PROTOTYPE( void main, (void) );
_PROTOTYPE( void prepare_shutdown, (int how) ); _PROTOTYPE( void prepare_shutdown, (int how) );
_PROTOTYPE( void stop_sequence, (struct timer *tp) ); _PROTOTYPE( void stop_sequence, (struct timer *tp) );
_PROTOTYPE( void shutdown, (struct timer *tp) );
/* misc.c */ /* misc.c */
_PROTOTYPE( void panic, (_CONST char *s, int n) ); _PROTOTYPE( void panic, (_CONST char *s, int n) );
@ -84,10 +81,6 @@ _PROTOTYPE( void lock_ready, (struct proc *rp) );
_PROTOTYPE( void lock_sched, (void) ); _PROTOTYPE( void lock_sched, (void) );
_PROTOTYPE( void lock_unready, (struct proc *rp) ); _PROTOTYPE( void lock_unready, (struct proc *rp) );
/* sb16_dsp.c, sb16_mixer.c */
_PROTOTYPE( void sb16dsp_task, (void) );
_PROTOTYPE( void sb16mix_task, (void) );
/* start.c */ /* start.c */
_PROTOTYPE( void cstart, (U16_t cs, U16_t ds, U16_t mds, _PROTOTYPE( void cstart, (U16_t cs, U16_t ds, U16_t mds,
U16_t parmoff, U16_t parmsize) ); U16_t parmoff, U16_t parmsize) );
@ -107,10 +100,7 @@ _PROTOTYPE( phys_bytes umap_remote, (struct proc *rp, int seg,
vir_bytes vir_addr, vir_bytes bytes) ); vir_bytes vir_addr, vir_bytes bytes) );
_PROTOTYPE( phys_bytes umap_bios, (struct proc *rp, vir_bytes vir_addr, _PROTOTYPE( phys_bytes umap_bios, (struct proc *rp, vir_bytes vir_addr,
vir_bytes bytes) ); vir_bytes bytes) );
_PROTOTYPE( int vir_copy, (int src_proc, vir_bytes src_vir,
int dst_proc, vir_bytes dst_vir, vir_bytes bytes) );
_PROTOTYPE( int generic_handler, (irq_hook_t *hook) ); _PROTOTYPE( int generic_handler, (irq_hook_t *hook) );
_PROTOTYPE( void timed_interrupt, (struct timer *tp) );
/* table.c */ /* table.c */
_PROTOTYPE( void mapdrivers, (void) ); _PROTOTYPE( void mapdrivers, (void) );

2
kernel/rtl8139.c
View file

@ -49,6 +49,8 @@
#include "kernel.h" #include "kernel.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stddef.h> #include <stddef.h>
#include <minix/com.h> #include <minix/com.h>
#include <minix/keymap.h> #include <minix/keymap.h>

3
kernel/sendmask.h
View file

@ -4,7 +4,8 @@
* (LOW_USER+1) + 1. This means that there are bits for each task, driver, and * (LOW_USER+1) + 1. This means that there are bits for each task, driver, and
* server process, INIT, and one bit to represent all ordinary user processes. * server process, INIT, and one bit to represent all ordinary user processes.
* *
* NOTE: the send masks definitions must be updated!!! * PLEASE NOTE: the send masks definitions are a mess and must be updated!!!
* this will be done when dynamic driver loading is implemented
* *
* Changes: * Changes:
* May 01, 2004 created and sendmask definitions (Jorrit N. Herder) * May 01, 2004 created and sendmask definitions (Jorrit N. Herder)

124
kernel/system.c
View file

@ -100,9 +100,10 @@ PRIVATE void initialize(void)
register struct proc *rp; register struct proc *rp;
int i; int i;
/* Initialize IRQ table. */ /* Initialize IRQ handler hooks. Mark all hooks available. */
for (i=0; i<NR_IRQ_VECTORS; i++) for (i=0; i<NR_IRQ_HOOKS; i++) {
irqtab[i].proc_nr = NONE; irq_hooks[i].proc_nr = NONE;
}
/* Initialize all alarm timers for all processes. */ /* Initialize all alarm timers for all processes. */
for (rp=BEG_PROC_ADDR; rp < END_PROC_ADDR; rp++) { for (rp=BEG_PROC_ADDR; rp < END_PROC_ADDR; rp++) {
@ -155,7 +156,7 @@ PRIVATE void initialize(void)
/* Copying. */ /* Copying. */
map(SYS_UMAP, do_umap); /* map virtual to physical address */ map(SYS_UMAP, do_umap); /* map virtual to physical address */
map(SYS_VIRCOPY, do_vircopy); /* use virtual addressing */ map(SYS_VIRCOPY, do_vircopy); /* use pure virtual addressing */
map(SYS_PHYSCOPY, do_physcopy); /* use physical addressing */ map(SYS_PHYSCOPY, do_physcopy); /* use physical addressing */
map(SYS_VIRVCOPY, do_virvcopy); /* vector with copy requests */ map(SYS_VIRVCOPY, do_virvcopy); /* vector with copy requests */
@ -238,69 +239,8 @@ irq_hook_t *hook;
* interrupts are transformed into messages to a driver. The IRQ line will be * interrupts are transformed into messages to a driver. The IRQ line will be
* reenabled if the policy says so. * reenabled if the policy says so.
*/ */
irq_policy_t policy = irqtab[hook->irq].policy; notify(hook->proc_nr, HARD_INT);
int proc_nr = irqtab[hook->irq].proc_nr; return(hook->policy & IRQ_REENABLE);
#if DEAD_CODE
/* This function handles hardware interrupt in a generic way, according to
* the policy set with SYS_IRQCTL. This is rather complicated since different
* devices require different actions. Options are (1) do nothing, (2a) read a
* port and optionally (2b) strobe the port high or (2c) low with the value
* read, or (3) write a value to a port. Finally, the policy may or may not
* reenable IRQs. A notification is sent in all cases.
*/
long port = irqtab[hook->irq].port;
phys_bytes addr = irqtab[hook->irq].addr;
long mask_val = irqtab[hook->irq].mask_val;
/* Read a value from the given port. Possibly also strobe the port with the
* read value. Strobe it high by using the mask provided by the caller;
* strobe it low by writing back the value we read.
*/
if (policy & (IRQ_READ_PORT|IRQ_STROBE|IRQ_ECHO_VAL)) {
switch(policy & (IRQ_BYTE|IRQ_WORD|IRQ_LONG)) {
case IRQ_BYTE: { /* byte values */
u8_t byteval = inb(port);
if (policy & IRQ_STROBE) outb(port, byteval | mask_val);
if (policy & IRQ_ECHO_VAL) outb(port, byteval);
if (policy & IRQ_READ_PORT)
phys_copy(vir2phys(&byteval), addr, sizeof(u8_t));
break;
} case IRQ_WORD: { /* word values */
u16_t wordval = inw(port);
if (policy & IRQ_STROBE) outw(port, wordval | mask_val);
if (policy & IRQ_ECHO_VAL) outw(port, wordval);
if (policy & IRQ_READ_PORT)
phys_copy(vir2phys(&wordval), addr, sizeof(u16_t));
break;
} case IRQ_LONG: { /* long values */
u32_t longval = inl(port);
if (policy & IRQ_STROBE) outl(port, longval | mask_val);
if (policy & IRQ_ECHO_VAL) outl(port, longval);
if (policy & IRQ_READ_PORT)
phys_copy(vir2phys(&longval), addr, sizeof(u32_t));
break;
} default: /* do nothing */ ; /* wrong type flags */
}
}
/* Write a value to some port. This is straightforward. Note that both
* reading and writing is not possible, hence 'else if' instead of 'if'.
*/
else if (policy & (IRQ_WRITE_PORT)) {
switch(policy & (IRQ_BYTE|IRQ_WORD|IRQ_LONG)) {
case IRQ_BYTE: outb(port, (u8_t) mask_val); break;
case IRQ_WORD: outw(port, (u16_t) mask_val); break;
case IRQ_LONG: outl(port, (u32_t) mask_val); break;
default: /* do nothing */ ; /* wrong type flags */
}
}
#endif /* DEAD_CODE */
/* Almost done, send a HARD_INT notification to allow further processing
* and possibly reenable interrupts - this depends on the policy given.
*/
notify(proc_nr, HARD_INT);
return(policy & IRQ_REENABLE);
} }
@ -436,33 +376,6 @@ vir_bytes bytes; /* # of bytes required in segment */
} }
#if ENABLE_MESSAGE_STATS
/*===========================================================================*
* do_mstats *
*===========================================================================*/
PRIVATE int do_mstats(m_ptr)
message *m_ptr; /* pointer to request message */
{
int r = 0;
if(m_ptr->m1_i1 > 0) {
struct message_statentry *dest;
struct proc *p;
p = proc_addr(m_ptr->m1_i3);
dest = proc_vir2phys(p, m_ptr->m1_p1);
r = mstat_copy(dest, m_ptr->m1_i1);
}
if(m_ptr->m1_i2) {
mstat_reset();
}
return r;
}
#endif /* ENABLE_MESSAGE_STATS */
/*===========================================================================* /*===========================================================================*
* umap_remote * * umap_remote *
*===========================================================================*/ *===========================================================================*/
@ -549,27 +462,4 @@ vir_bytes bytes; /* # of bytes to copy */
return(OK); return(OK);
} }
/*==========================================================================*
* vir_copy *
*==========================================================================*/
PUBLIC int vir_copy(src_proc, src_vir, dst_proc, dst_vir, bytes)
int src_proc; /* source process */
vir_bytes src_vir; /* source virtual address within D seg */
int dst_proc; /* destination process */
vir_bytes dst_vir; /* destination virtual address within D seg */
vir_bytes bytes; /* # of bytes to copy */
{
/* Copy bytes from one process to another. Meant for the easy cases, where
* speed isn't required. (One can normally do without one of the umaps.)
*/
phys_bytes src_phys, dst_phys;
src_phys = umap_local(proc_addr(src_proc), D, src_vir, bytes);
dst_phys = umap_local(proc_addr(dst_proc), D, dst_vir, bytes);
if (src_phys == 0 || dst_phys == 0) return(EFAULT);
phys_copy(src_phys, dst_phys, (phys_bytes) bytes);
return(OK);
}

4
kernel/system/Makefile
View file

@ -19,7 +19,7 @@ LD = $(CC) -.o
CFLAGS = -I$i CFLAGS = -I$i
LDFLAGS = -i LDFLAGS = -i
SYS = alarms.o copying.o debugging.o devio.o irqctl.o proctl.o \ SYS = clock.o copying.o debugging.o devio.o irqctl.o proctl.o \
sysctl.o misc.o sigctl.o tracing.o \ sysctl.o misc.o sigctl.o tracing.o \
# What to make. # What to make.
@ -39,7 +39,7 @@ a = $h/config.h $h/const.h $h/type.h $h/ipc.h \
# Dependencies from src/kernel/system.h # Dependencies from src/kernel/system.h
b = $k/system.h $h/com.h $k/proc.h $k/assert.h b = $k/system.h $h/com.h $k/proc.h $k/assert.h
alarms.o: $a $b clock.o: $a $b
copying.o: $a $b copying.o: $a $b
debugging.o: $a $b debugging.o: $a $b
devio.o: $a $b $h/devio.h devio.o: $a $b $h/devio.h

30
kernel/system/copying.c
View file

@ -125,16 +125,34 @@ register message *m_ptr; /* pointer to request message */
PUBLIC int do_umap(m_ptr) PUBLIC int do_umap(m_ptr)
register message *m_ptr; /* pointer to request message */ register message *m_ptr; /* pointer to request message */
{ {
/* Same as umap_local(), for non-kernel processes. */ /* Map virtual address to physical, for non-kernel processes. */
int seg_type = m_ptr->CP_SRC_SPACE & SEGMENT_TYPE;
int seg_index = m_ptr->CP_SRC_SPACE & SEGMENT_INDEX;
vir_bytes offset = m_ptr->CP_SRC_ADDR;
int count = m_ptr->CP_NR_BYTES;
int proc_nr = (int) m_ptr->CP_SRC_PROC_NR; int proc_nr = (int) m_ptr->CP_SRC_PROC_NR;
phys_bytes phys_addr;
/* Verify process number. */
if (proc_nr == SELF) proc_nr = m_ptr->m_source; if (proc_nr == SELF) proc_nr = m_ptr->m_source;
if (! isokprocn(proc_nr)) return(EINVAL); if (! isokprocn(proc_nr)) return(EINVAL);
m_ptr->CP_DST_ADDR = umap_local(proc_addr(proc_nr), /* See which mapping should be made. */
(int) m_ptr->CP_SRC_SPACE, switch(seg_type) {
(vir_bytes) m_ptr->CP_SRC_ADDR, case LOCAL_SEG:
(vir_bytes) m_ptr->CP_NR_BYTES); phys_addr = umap_local(proc_addr(proc_nr), seg_index, offset, count);
return(OK); break;
case REMOTE_SEG:
phys_addr = umap_remote(proc_addr(proc_nr), seg_index, offset, count);
break;
case BIOS_SEG:
phys_addr = umap_bios(proc_addr(proc_nr), offset, count);
break;
default:
return(EINVAL);
}
m_ptr->CP_DST_ADDR = phys_addr;
return (phys_addr == 0) ? EFAULT: OK;
} }

100
kernel/system/irqctl.c
View file

@ -4,11 +4,8 @@
* The parameters for this system call are: * The parameters for this system call are:
* m5_c1: IRQ_REQUEST (control operation to perform) * m5_c1: IRQ_REQUEST (control operation to perform)
* m5_c2: IRQ_VECTOR (irq line that must be controlled) * m5_c2: IRQ_VECTOR (irq line that must be controlled)
* m5_i1: IRQ_POLICY (flags to control the IRQCTL request) * m5_i1: IRQ_POLICY (irq policy allows reenabling interrupts)
* m5_i2: IRQ_PROC_NR (process number to notify) * m5_l3: IRQ_HOOK_ID (index of irq hook assigned at kernel)
* m5_l1: IRQ_PORT (port to write to / read from)
* m5_l2: IRQ_VIR_ADDR (virtual address at caller)
* m5_l3: IRQ_MASK_VAL (value to be written or strobe mask)
* *
* Author: * Author:
* Jorrit N. Herder <jnherder@cs.vu.nl> * Jorrit N. Herder <jnherder@cs.vu.nl>
@ -17,91 +14,64 @@
#include "../kernel.h" #include "../kernel.h"
#include "../system.h" #include "../system.h"
/*===========================================================================* /*===========================================================================*
* do_irqctl * * do_irqctl *
*===========================================================================*/ *===========================================================================*/
PUBLIC int do_irqctl(m_ptr) PUBLIC int do_irqctl(m_ptr)
register message *m_ptr; /* pointer to request message */ register message *m_ptr; /* pointer to request message */
{ {
/* Dismember the request message. */ /* Dismember the request message. */
int irq = m_ptr->IRQ_VECTOR; /* which IRQ vector */ int irq_vec;
int policy = m_ptr->IRQ_POLICY; /* policy field with flags */ int irq_hook_id;
int proc_nr = m_ptr->IRQ_PROC_NR; /* process number to forward to */ int proc_nr;
#if DEAD_CODE irq_hook_t *hook_ptr;
long port = m_ptr->IRQ_PORT; /* port to read or write */
vir_bytes vir_addr = m_ptr->IRQ_VIR_ADDR; /* address at caller */
phys_bytes phys_addr = 0; /* calculate physical address */
long mask_val = m_ptr->IRQ_MASK_VAL; /* mask or value to be written */
#endif
/* Check if IRQ line is acceptable. */
if ((unsigned) irq >= NR_IRQ_VECTORS) {
kprintf("ST: irq line %d is not acceptable!\n", irq);
return(EINVAL);
}
/* See what is requested and take needed actions. */ /* See what is requested and take needed actions. */
switch(m_ptr->IRQ_REQUEST) { switch(m_ptr->IRQ_REQUEST) {
/* Enable or disable IRQs. This is straightforward. */ /* Enable or disable IRQs. This is straightforward. */
case IRQ_ENABLE: { case IRQ_ENABLE: {
enable_irq(&irqtab[irq].hook); irq_hook_id = (unsigned) m_ptr->IRQ_HOOK_ID;
if (irq_hook_id >= NR_IRQ_HOOKS) return(EINVAL);
enable_irq(&irq_hooks[irq_hook_id]);
break; break;
} }
case IRQ_DISABLE: { case IRQ_DISABLE: {
disable_irq(&irqtab[irq].hook); irq_hook_id = (unsigned) m_ptr->IRQ_HOOK_ID;
if (irq_hook_id >= NR_IRQ_HOOKS) return(EINVAL);
disable_irq(&irq_hooks[irq_hook_id]);
break; break;
} }
/* Control IRQ policies. Set a policy and needed details in the IRQ table. /* Control IRQ policies. Set a policy and needed details in the IRQ table.
* This policy is used by a generic function to handle hardware interrupts. * This policy is used by a generic function to handle hardware interrupts.
* The generic_handler() is contained in system.c.
*/ */
case IRQ_SETPOLICY: { case IRQ_SETPOLICY: {
if (proc_nr == NONE) { /* remove irqtab entry */ /* Check if IRQ line is acceptable. */
if (irqtab[irq].proc_nr != m_ptr->m_source) { irq_vec = (unsigned) m_ptr->IRQ_VECTOR;
return(EPERM); /* only owner may do so */ if ((unsigned) irq_vec >= NR_IRQ_VECTORS) {
kprintf("ST: irq line %d is not acceptable!\n", irq_vec);
return(EINVAL);
}
/* Find a free IRQ hook for this mapping. */
hook_ptr = NULL;
for (irq_hook_id=0; irq_hook_id<NR_IRQ_HOOKS; irq_hook_id++) {
if (irq_hooks[irq_hook_id].proc_nr == NONE) {
hook_ptr = &irq_hooks[irq_hook_id]; /* free hook */
break;
} }
kprintf("ST: notify: cannot remove entry for IRQ %d\n",irq);
return(ENOSYS); /* not yet supported */
}
else { /* install generic handler */
if (irqtab[irq].proc_nr != NONE) { /* IRQ entry already taken */
kprintf("ST: notify: slot for IRQ %d already taken\n", irq);
return(EBUSY); /* cannot overwrite entry */
}
if (proc_nr == SELF) /* check for magic proc nr */
proc_nr = m_ptr->m_source; /* set caller's proc nr */
if (! isokprocn(proc_nr)) { /* check if proc nr is ok */
kprintf("ST: notify: invalid proc_nr: %d\n", proc_nr);
return(EINVAL);
}
#if DEAD_CODE
if (policy & IRQ_READ_PORT) { /* get phys_addr at caller */
switch(policy & (IRQ_BYTE|IRQ_WORD|IRQ_LONG)) {
case IRQ_BYTE: phys_addr=numap_local(proc_nr,vir_addr,sizeof( u8_t));
break;
case IRQ_WORD: phys_addr=numap_local(proc_nr,vir_addr,sizeof(u16_t));
break;
case IRQ_LONG: phys_addr=numap_local(proc_nr,vir_addr,sizeof(u32_t));
break;
default: return(EINVAL); /* wrong type flags */
}
if (phys_addr==0) return(EFAULT); /* invalid address */
}
#endif
/* Arguments seem to be OK, register them in the IRQ table. */
irqtab[irq].policy = policy; /* policy for interrupts */
irqtab[irq].proc_nr = proc_nr; /* process number to notify */
#if DEAD_CODE
irqtab[irq].port = port; /* port to read or write */
irqtab[irq].addr = phys_addr; /* address to store status */
irqtab[irq].mask_val = mask_val; /* strobe mask or value */
#endif
put_irq_handler(&irqtab[irq].hook, irq, generic_handler);
} }
if (hook_ptr == NULL) return(ENOSPC);
/* Only caller can request IRQ mappings. Install handler. */
hook_ptr->proc_nr = m_ptr->m_source; /* process to notify */
hook_ptr->policy = m_ptr->IRQ_POLICY; /* policy for interrupts */
put_irq_handler(hook_ptr, irq_vec, generic_handler);
/* Return index of the IRQ hook in use. */
m_ptr->IRQ_HOOK_ID = irq_hook_id;
break; break;
} }
default: default:

53
kernel/system/misc.c
View file

@ -1,47 +1,8 @@
/* The system call implemented in this file:
* m_type: SYS_TIMES
*
* The parameters for this system call are:
* m4_l1: T_PROC_NR (get info for this process)
* m4_l1: T_USER_TIME (return values ...)
* m4_l2: T_SYSTEM_TIME
* m4_l3: T_CHILD_UTIME
* m4_l4: T_CHILD_STIME
* m4_l5: T_BOOT_TICKS
*/
#include "../kernel.h" #include "../kernel.h"
#include "../system.h" #include "../system.h"
#include <unistd.h> #include <unistd.h>
INIT_ASSERT INIT_ASSERT
/*===========================================================================*
* do_times *
*===========================================================================*/
PUBLIC int do_times(m_ptr)
register message *m_ptr; /* pointer to request message */
{
/* Handle sys_times(). Retrieve the accounting information. */
register struct proc *rp;
int proc_nr;
/* Insert the times needed by the SYS_TIMES system call in the message. */
proc_nr = (m_ptr->T_PROC_NR == SELF) ? m_ptr->m_source : m_ptr->T_PROC_NR;
if (isokprocn(proc_nr)) {
rp = proc_addr(m_ptr->T_PROC_NR);
lock(); /* halt the volatile time counters in rp */
m_ptr->T_USER_TIME = rp->user_time;
m_ptr->T_SYSTEM_TIME = rp->sys_time;
unlock();
m_ptr->T_CHILD_UTIME = rp->child_utime;
m_ptr->T_CHILD_STIME = rp->child_stime;
}
m_ptr->T_BOOT_TICKS = get_uptime();
return(OK);
}
/*===========================================================================* /*===========================================================================*
* do_unused * * do_unused *
@ -119,8 +80,6 @@ message *m_ptr; /* pointer to request message */
* Jorrit N. Herder <jnherder@cs.vu.nl> * Jorrit N. Herder <jnherder@cs.vu.nl>
*/ */
/*===========================================================================* /*===========================================================================*
* do_getinfo * * do_getinfo *
*===========================================================================*/ *===========================================================================*/
@ -150,9 +109,9 @@ register message *m_ptr; /* pointer to request message */
src_phys = vir2phys(image); src_phys = vir2phys(image);
break; break;
} }
case GET_IRQTAB: { case GET_IRQHOOKS: {
length = sizeof(struct irqtab) * NR_IRQ_VECTORS; length = sizeof(struct irq_hook) * NR_IRQ_HOOKS;
src_phys = vir2phys(irqtab); src_phys = vir2phys(irq_hooks);
break; break;
} }
case GET_MEMCHUNKS: { case GET_MEMCHUNKS: {
@ -200,6 +159,7 @@ register message *m_ptr; /* pointer to request message */
} else { /* lookup nr by name */ } else { /* lookup nr by name */
int proc_found = FALSE; int proc_found = FALSE;
struct proc *pp; struct proc *pp;
struct vir_addr vsrc, vdst;
char key[8]; /* storage for process name to lookup */ char key[8]; /* storage for process name to lookup */
#if DEAD_CODE #if DEAD_CODE
/* GET_PROCNR functionality will be moved to the Process Manager! */ /* GET_PROCNR functionality will be moved to the Process Manager! */
@ -207,8 +167,13 @@ register message *m_ptr; /* pointer to request message */
#endif #endif
proc_nr = m_ptr->m_source; /* only caller can request copy */ proc_nr = m_ptr->m_source; /* only caller can request copy */
if (m_ptr->I_KEY_LEN > sizeof(key)) return(EINVAL); if (m_ptr->I_KEY_LEN > sizeof(key)) return(EINVAL);
vsrc.proc_nr = proc_nr; vsrc.segment = D; vsrc.offset = (vir_bytes) m_ptr->I_KEY_PTR;
vdst.proc_nr = SYSTASK, vdst.segment = D; vdst.offset = (vir_bytes) key;
if (virtual_copy(&vsrc, &vdst, m_ptr->I_KEY_LEN) != OK) return(EFAULT);
#if DEAD_CODE
if (vir_copy(proc_nr, (vir_bytes) m_ptr->I_KEY_PTR, SYSTASK, if (vir_copy(proc_nr, (vir_bytes) m_ptr->I_KEY_PTR, SYSTASK,
(vir_bytes) key, m_ptr->I_KEY_LEN) != OK) return(EFAULT); (vir_bytes) key, m_ptr->I_KEY_LEN) != OK) return(EFAULT);
#endif
for (pp=BEG_PROC_ADDR; pp<END_PROC_ADDR; pp++) { for (pp=BEG_PROC_ADDR; pp<END_PROC_ADDR; pp++) {
if (kstrncmp(pp->p_name, key, m_ptr->I_KEY_LEN) == 0) { if (kstrncmp(pp->p_name, key, m_ptr->I_KEY_LEN) == 0) {
src_phys = vir2phys(&(pp->p_nr)); src_phys = vir2phys(&(pp->p_nr));

2
kernel/system/sysctl.c
View file

@ -60,6 +60,7 @@ message *m_ptr; /* pointer to request message */
* m2_p1: CTL_ARG_PTR (argument pointer) * m2_p1: CTL_ARG_PTR (argument pointer)
*/ */
/* NOTE: this call will radically change! */
/*===========================================================================* /*===========================================================================*
* do_svrctl * * do_svrctl *
@ -125,7 +126,6 @@ message *m_ptr; /* pointer to request message */
* Jorrit N. Herder <jnherder@cs.vu.nl> * Jorrit N. Herder <jnherder@cs.vu.nl>
*/ */
/*===========================================================================* /*===========================================================================*
* do_segctl * * do_segctl *
*===========================================================================*/ *===========================================================================*/

34
kernel/type.h
View file

@ -2,8 +2,6 @@
#define TYPE_H #define TYPE_H
typedef _PROTOTYPE( void task_t, (void) ); typedef _PROTOTYPE( void task_t, (void) );
typedef _PROTOTYPE( int (*rdwt_t), (message *m_ptr) );
typedef _PROTOTYPE( void (*watchdog_t), (void) );
/* Type accepted by kprintf(). This is a hack to accept both integers and /* Type accepted by kprintf(). This is a hack to accept both integers and
* char pointers in the same argument. * char pointers in the same argument.
@ -28,11 +26,6 @@ struct memory {
phys_clicks size; /* size of memory chunk */ phys_clicks size; /* size of memory chunk */
}; };
struct bios {
phys_bytes bios_addr; /* physical address at BIOS */
size_t bios_length; /* size of value */
};
#if (CHIP == INTEL) #if (CHIP == INTEL)
typedef u16_t port_t; typedef u16_t port_t;
@ -79,30 +72,19 @@ struct segdesc_s { /* segment descriptor for protected mode */
u8_t base_high; u8_t base_high;
}; };
typedef unsigned long irq_policy_t;
typedef struct irq_hook { typedef struct irq_hook {
struct irq_hook *next; struct irq_hook *next; /* next hook in chain */
int (*handler)(struct irq_hook *); int (*handler)(struct irq_hook *); /* interrupt handler */
int irq; int irq; /* IRQ vector number */
int id; int id; /* id of this hook */
int proc_nr; /* NONE if not in use */
irq_policy_t policy; /* bit mask for policy */
} irq_hook_t; } irq_hook_t;
typedef int (*irq_handler_t)(struct irq_hook *); typedef int (*irq_handler_t)(struct irq_hook *);
/* The IRQ table is used to handle harware interrupts based on a policy set
* by a device driver. The policy is stored with a SYS_IRQCTL system call and
* used by a generic function to handle hardware interrupts in an appropriate
* way for the device.
*/
typedef unsigned long irq_policy_t;
struct irqtab {
irq_hook_t hook; /* its irq hook */
irq_policy_t policy; /* bit mask for the policy */
int proc_nr; /* process number to be notified */
long port; /* port to be read or written */
phys_bytes addr; /* absolute address to store or get value */
long mask_val; /* mask for strobing or value to be written */
};
#endif /* (CHIP == INTEL) */ #endif /* (CHIP == INTEL) */
#if (CHIP == M68000) #if (CHIP == M68000)

16
lib/syslib/sys_irqctl.c
View file

@ -3,14 +3,11 @@
/*===========================================================================* /*===========================================================================*
* sys_irqctl * * sys_irqctl *
*===========================================================================*/ *===========================================================================*/
PUBLIC int sys_irqctl(req, irq_vec, policy, proc_nr, port, val_ptr, mask_val) PUBLIC int sys_irqctl(req, irq_vec, policy, hook_id)
int req; /* IRQ control request */ int req; /* IRQ control request */
int irq_vec; /* IRQ vector to control */ int irq_vec; /* IRQ vector to control */
int policy; /* bit mask for policy flags */ int policy; /* bit mask for policy flags */
int proc_nr; /* process number to notify */ int *hook_id; /* ID of IRQ hook at kernel */
long port; /* port to read or write */
void *val_ptr; /* address store value read */
long mask_val; /* strobe mask or value to write */
{ {
message m_irq; message m_irq;
int s; int s;
@ -19,12 +16,11 @@ long mask_val; /* strobe mask or value to write */
m_irq.IRQ_REQUEST = req; m_irq.IRQ_REQUEST = req;
m_irq.IRQ_VECTOR = irq_vec; m_irq.IRQ_VECTOR = irq_vec;
m_irq.IRQ_POLICY = policy; m_irq.IRQ_POLICY = policy;
m_irq.IRQ_PROC_NR = proc_nr; m_irq.IRQ_HOOK_ID = *hook_id;
m_irq.IRQ_PORT = port;
m_irq.IRQ_VIR_ADDR = (vir_bytes) val_ptr;
m_irq.IRQ_MASK_VAL = mask_val;
return _taskcall(SYSTASK, SYS_IRQCTL, &m_irq); s = _taskcall(SYSTASK, SYS_IRQCTL, &m_irq);
if (req == IRQ_SETPOLICY) *hook_id = m_irq.IRQ_HOOK_ID;
return(s);
} }

16
servers/is/dmp.c
View file

@ -168,8 +168,8 @@ PRIVATE void monparams_dmp()
PRIVATE void irqtab_dmp() PRIVATE void irqtab_dmp()
{ {
int i,j,r; int i,j,r;
struct irqtab irqtab[NR_IRQ_VECTORS]; struct irq_hook irqhooks[NR_IRQ_HOOKS];
struct irqtab *e; /* irq tab entry */ struct irq_hook *e; /* irq tab entry */
int p; /* policy */ int p; /* policy */
char *irq[] = { char *irq[] = {
"clock", /* 00 */ "clock", /* 00 */
@ -190,12 +190,13 @@ PRIVATE void irqtab_dmp()
"at_wini_1", /* 15 */ "at_wini_1", /* 15 */
}; };
if ((r = sys_getirqtab(irqtab)) != OK) { if ((r = sys_getirqhooks(irqhooks)) != OK) {
report("warning: couldn't get copy of irqtab", r); report("warning: couldn't get copy of irq hooks", r);
return; return;
} }
printf("IRQ table dump showing hardware interrupt policies for each IRQ vector.\n"); printf("IRQ table dump showing hardware interrupt policies for each IRQ vector.\n");
#if 0
printf("-irq name/nr- -pnr- --port-- msk_val --addr-- -type-rdp-str-ech-wrp-ena- \n"); printf("-irq name/nr- -pnr- --port-- msk_val --addr-- -type-rdp-str-ech-wrp-ena- \n");
for (i=0; i<NR_IRQ_VECTORS; i++) { for (i=0; i<NR_IRQ_VECTORS; i++) {
e = &irqtab[i]; e = &irqtab[i];
@ -203,16 +204,13 @@ PRIVATE void irqtab_dmp()
printf("%9s %2d ", irq[i], i); printf("%9s %2d ", irq[i], i);
if (e->proc_nr!=NONE) printf("%4d ", e->proc_nr); if (e->proc_nr!=NONE) printf("%4d ", e->proc_nr);
else printf(" "); else printf(" ");
printf(" 0x%06x 0x%05x 0x%06x %c%c%c %d %d %d %d %d\n", printf(" 0x%06x 0x%05x 0x%06x %c%c%c %d\n",
e->port, e->mask_val, e->addr, e->port, e->mask_val, e->addr,
(p&IRQ_BYTE)?'B':'-', (p&IRQ_WORD)?'W':'-', (p&IRQ_LONG)?'L':'-', (p&IRQ_BYTE)?'B':'-', (p&IRQ_WORD)?'W':'-', (p&IRQ_LONG)?'L':'-',
((p&IRQ_READ_PORT) != 0),
((p&IRQ_STROBE) != 0),
((p&IRQ_ECHO_VAL) != 0),
((p&IRQ_WRITE_PORT) != 0),
((p&IRQ_REENABLE) != 0) ((p&IRQ_REENABLE) != 0)
); );
} }
#endif
printf("\n"); printf("\n");
} }

4
tools/Makefile
View file

@ -21,7 +21,9 @@ PROGRAMS= ../kernel/kernel \
usage: usage:
@echo " " >&2 @echo " " >&2
@echo "Master Makefile to create new MINIX configuration. Root privileges required." >&2 @echo "Master Makefile to create new MINIX configuration." >& 2
@echo "Root privileges are required." >&2
@echo " " >&2
@echo "Usage:" >&2 @echo "Usage:" >&2
@echo " make libraries # Make system libraries" >&2 @echo " make libraries # Make system libraries" >&2
@echo " make programs # Compile and install all programs" >&2 @echo " make programs # Compile and install all programs" >&2