mirror of
https://github.com/opnsense/src.git
synced 2026-05-28 04:12:45 -04:00
Sync with following files:
- sys/i386/i386/machdep.c revision 1.271 - sys/i386/i386/trap.c revision 1.114 - sys/i386/isa/if_ed.c revision 1.128 - sys/i386/isa/if_fe.c revision 1.34 - sys/i386/isa/syscons.c revision 1.238. - sys/i386/isa/wd.c revision 1.144
This commit is contained in:
KATO Takenori
parent
0abc78a697
commit
eef2db22e1
7 changed files with 34 additions and 40 deletions
|
|
@ -35,7 +35,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
|
||||
* $Id: machdep.c,v 1.59 1997/10/12 11:58:09 kato Exp $
|
||||
* $Id: machdep.c,v 1.60 1997/10/13 09:21:16 kato Exp $
|
||||
*/
|
||||
|
||||
#include "apm.h"
|
||||
|
|
@ -239,10 +239,10 @@ cpu_startup(dummy)
|
|||
|
||||
printf("Physical memory chunk(s):\n");
|
||||
for (indx = 0; phys_avail[indx + 1] != 0; indx += 2) {
|
||||
int size = phys_avail[indx + 1] - phys_avail[indx];
|
||||
int size1 = phys_avail[indx + 1] - phys_avail[indx];
|
||||
|
||||
printf("0x%08lx - 0x%08lx, %d bytes (%d pages)\n", phys_avail[indx],
|
||||
phys_avail[indx + 1] - 1, size, size / PAGE_SIZE);
|
||||
phys_avail[indx + 1] - 1, size1, size1 / PAGE_SIZE);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -606,12 +606,11 @@ sendsig(catcher, sig, mask, code)
|
|||
* state to gain improper privileges.
|
||||
*/
|
||||
int
|
||||
sigreturn(p, uap, retval)
|
||||
sigreturn(p, uap)
|
||||
struct proc *p;
|
||||
struct sigreturn_args /* {
|
||||
struct sigcontext *sigcntxp;
|
||||
} */ *uap;
|
||||
int *retval;
|
||||
{
|
||||
register struct sigcontext *scp;
|
||||
register struct sigframe *fp;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
|
||||
* $Id: trap.c,v 1.36 1997/09/22 12:20:42 kato Exp $
|
||||
* $Id: trap.c,v 1.37 1997/10/12 11:57:23 kato Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -954,7 +954,7 @@ syscall(frame)
|
|||
struct proc *p = curproc;
|
||||
u_quad_t sticks;
|
||||
int error;
|
||||
int args[8], rval[2];
|
||||
int args[8];
|
||||
u_int code;
|
||||
|
||||
sticks = p->p_sticks;
|
||||
|
|
@ -1006,10 +1006,10 @@ syscall(frame)
|
|||
if (KTRPOINT(p, KTR_SYSCALL))
|
||||
ktrsyscall(p->p_tracep, code, callp->sy_narg, args);
|
||||
#endif
|
||||
rval[0] = 0;
|
||||
rval[1] = frame.tf_edx;
|
||||
p->p_retval[0] = 0;
|
||||
p->p_retval[1] = frame.tf_edx;
|
||||
|
||||
error = (*callp->sy_call)(p, args, rval);
|
||||
error = (*callp->sy_call)(p, args);
|
||||
|
||||
switch (error) {
|
||||
|
||||
|
|
@ -1019,8 +1019,8 @@ syscall(frame)
|
|||
* if this is a child returning from fork syscall.
|
||||
*/
|
||||
p = curproc;
|
||||
frame.tf_eax = rval[0];
|
||||
frame.tf_edx = rval[1];
|
||||
frame.tf_eax = p->p_retval[0];
|
||||
frame.tf_edx = p->p_retval[1];
|
||||
frame.tf_eflags &= ~PSL_C;
|
||||
break;
|
||||
|
||||
|
|
@ -1057,7 +1057,7 @@ bad:
|
|||
|
||||
#ifdef KTRACE
|
||||
if (KTRPOINT(p, KTR_SYSRET))
|
||||
ktrsysret(p->p_tracep, code, error, rval[0]);
|
||||
ktrsysret(p->p_tracep, code, error, p->p_retval[0]);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: if_ed.c,v 1.33 1997/10/29 08:14:56 kato Exp $
|
||||
* $Id: if_ed.c,v 1.34 1997/11/03 02:27:36 kato Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -3325,7 +3325,6 @@ ed_ioctl(ifp, command, data)
|
|||
caddr_t data;
|
||||
{
|
||||
struct ed_softc *sc = ifp->if_softc;
|
||||
struct ifreq *ifr = (struct ifreq *) data;
|
||||
int s, error = 0;
|
||||
|
||||
if (sc->gone) {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Id: if_fe.c,v 1.24 1997/10/27 10:59:48 kato Exp $
|
||||
* $Id: if_fe.c,v 1.25 1997/11/03 02:28:39 kato Exp $
|
||||
*
|
||||
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
|
||||
* To be used with FreeBSD 2.x
|
||||
|
|
@ -1807,7 +1807,7 @@ fe_init_ati ( struct fe_softc * sc )
|
|||
static int
|
||||
fe_probe_gwy ( DEVICE * dev, struct fe_softc * sc )
|
||||
{
|
||||
int i,type;
|
||||
int i;
|
||||
|
||||
static struct fe_simple_probe_struct probe_table [] = {
|
||||
{ FE_DLCR2, 0x70, 0x00 },
|
||||
|
|
@ -2359,7 +2359,7 @@ static void
|
|||
fe_init ( int unit )
|
||||
{
|
||||
struct fe_softc *sc = &fe_softc[unit];
|
||||
int i, s;
|
||||
int s;
|
||||
|
||||
#if FE_DEBUG >= 3
|
||||
fe_dump( LOG_INFO, sc, "init()" );
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
|
||||
* $Id: machdep.c,v 1.59 1997/10/12 11:58:09 kato Exp $
|
||||
* $Id: machdep.c,v 1.60 1997/10/13 09:21:16 kato Exp $
|
||||
*/
|
||||
|
||||
#include "apm.h"
|
||||
|
|
@ -239,10 +239,10 @@ cpu_startup(dummy)
|
|||
|
||||
printf("Physical memory chunk(s):\n");
|
||||
for (indx = 0; phys_avail[indx + 1] != 0; indx += 2) {
|
||||
int size = phys_avail[indx + 1] - phys_avail[indx];
|
||||
int size1 = phys_avail[indx + 1] - phys_avail[indx];
|
||||
|
||||
printf("0x%08lx - 0x%08lx, %d bytes (%d pages)\n", phys_avail[indx],
|
||||
phys_avail[indx + 1] - 1, size, size / PAGE_SIZE);
|
||||
phys_avail[indx + 1] - 1, size1, size1 / PAGE_SIZE);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -606,12 +606,11 @@ sendsig(catcher, sig, mask, code)
|
|||
* state to gain improper privileges.
|
||||
*/
|
||||
int
|
||||
sigreturn(p, uap, retval)
|
||||
sigreturn(p, uap)
|
||||
struct proc *p;
|
||||
struct sigreturn_args /* {
|
||||
struct sigcontext *sigcntxp;
|
||||
} */ *uap;
|
||||
int *retval;
|
||||
{
|
||||
register struct sigcontext *scp;
|
||||
register struct sigframe *fp;
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: syscons.c,v 1.60 1997/10/23 09:26:30 kato Exp $
|
||||
* $Id: syscons.c,v 1.61 1997/10/27 10:58:30 kato Exp $
|
||||
*/
|
||||
|
||||
#include "sc.h"
|
||||
|
|
@ -702,7 +702,6 @@ sckbdprobe(int unit, int flags)
|
|||
goto fail;
|
||||
}
|
||||
|
||||
succeed:
|
||||
kbdc_set_device_mask(sc_kbdc, m | KBD_KBD_CONTROL_BITS),
|
||||
kbdc_lock(sc_kbdc, FALSE);
|
||||
return TRUE;
|
||||
|
|
@ -1250,15 +1249,15 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
|
|||
cur_console->status |= MOUSE_VISIBLE;
|
||||
if ((MOUSE_TTY)->t_state & TS_ISOPEN) {
|
||||
u_char buf[5];
|
||||
int i;
|
||||
int j;
|
||||
|
||||
buf[0] = 0x80 | ((~mouse->u.data.buttons) & 0x07);
|
||||
buf[1] = (mouse->u.data.x & 0x1fe >> 1);
|
||||
buf[3] = (mouse->u.data.x & 0x1ff) - buf[1];
|
||||
buf[2] = -(mouse->u.data.y & 0x1fe >> 1);
|
||||
buf[4] = -(mouse->u.data.y & 0x1ff) - buf[2];
|
||||
for (i=0; i<5; i++)
|
||||
(*linesw[(MOUSE_TTY)->t_line].l_rint)(buf[i],MOUSE_TTY);
|
||||
for (j=0; j<5; j++)
|
||||
(*linesw[(MOUSE_TTY)->t_line].l_rint)(buf[j],MOUSE_TTY);
|
||||
}
|
||||
if (cur_console->mouse_signal) {
|
||||
cur_console->mouse_buttons = mouse->u.data.buttons;
|
||||
|
|
@ -4427,7 +4426,6 @@ set_keyboard(int command, int data)
|
|||
{
|
||||
#ifndef PC98
|
||||
int s;
|
||||
int c;
|
||||
|
||||
if (sc_kbdc == NULL)
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
|
||||
* $Id: wd.c,v 1.34 1997/10/13 09:24:04 kato Exp $
|
||||
* $Id: wd.c,v 1.35 1997/11/04 12:58:48 kato Exp $
|
||||
*/
|
||||
|
||||
/* TODO:
|
||||
|
|
@ -305,7 +305,6 @@ static int
|
|||
wdprobe(struct isa_device *dvp)
|
||||
{
|
||||
int unit = dvp->id_unit;
|
||||
void *cookie;
|
||||
int interface;
|
||||
struct disk *du;
|
||||
|
||||
|
|
@ -929,7 +928,7 @@ wdstart(int ctrlr)
|
|||
/* if starting a multisector transfer, or doing single transfers */
|
||||
if (du->dk_skip == 0 || (du->dk_flags & DKFL_SINGLE)) {
|
||||
u_int command;
|
||||
u_int count;
|
||||
u_int count1;
|
||||
long cylin, head, sector;
|
||||
|
||||
cylin = blknum / secpercyl;
|
||||
|
|
@ -943,14 +942,14 @@ wdstart(int ctrlr)
|
|||
if (wdtab[ctrlr].b_errcnt && (bp->b_flags & B_READ) == 0)
|
||||
du->dk_bc += DEV_BSIZE;
|
||||
|
||||
count = howmany( du->dk_bc, DEV_BSIZE);
|
||||
count1 = howmany( du->dk_bc, DEV_BSIZE);
|
||||
|
||||
du->dk_flags &= ~DKFL_MULTI;
|
||||
|
||||
#ifdef B_FORMAT
|
||||
if (bp->b_flags & B_FORMAT) {
|
||||
command = WDCC_FORMAT;
|
||||
count = lp->d_nsectors;
|
||||
count1 = lp->d_nsectors;
|
||||
sector = lp->d_gap3 - 1; /* + 1 later */
|
||||
} else
|
||||
#endif
|
||||
|
|
@ -959,7 +958,7 @@ wdstart(int ctrlr)
|
|||
if (du->dk_flags & DKFL_SINGLE) {
|
||||
command = (bp->b_flags & B_READ)
|
||||
? WDCC_READ : WDCC_WRITE;
|
||||
count = 1;
|
||||
count1 = 1;
|
||||
du->dk_currentiosize = 1;
|
||||
} else {
|
||||
if((du->dk_flags & DKFL_USEDMA) &&
|
||||
|
|
@ -973,8 +972,8 @@ wdstart(int ctrlr)
|
|||
command = WDCC_READ_DMA;
|
||||
else
|
||||
command = WDCC_WRITE_DMA;
|
||||
du->dk_currentiosize = count;
|
||||
} else if( (count > 1) && (du->dk_multi > 1)) {
|
||||
du->dk_currentiosize = count1;
|
||||
} else if( (count1 > 1) && (du->dk_multi > 1)) {
|
||||
du->dk_flags |= DKFL_MULTI;
|
||||
if( bp->b_flags & B_READ) {
|
||||
command = WDCC_READ_MULTI;
|
||||
|
|
@ -982,8 +981,8 @@ wdstart(int ctrlr)
|
|||
command = WDCC_WRITE_MULTI;
|
||||
}
|
||||
du->dk_currentiosize = du->dk_multi;
|
||||
if( du->dk_currentiosize > count)
|
||||
du->dk_currentiosize = count;
|
||||
if( du->dk_currentiosize > count1)
|
||||
du->dk_currentiosize = count1;
|
||||
} else {
|
||||
if( bp->b_flags & B_READ) {
|
||||
command = WDCC_READ;
|
||||
|
|
@ -1018,7 +1017,7 @@ wdstart(int ctrlr)
|
|||
du->dk_bc,
|
||||
bp->b_flags & B_READ);
|
||||
}
|
||||
while (wdcommand(du, cylin, head, sector, count, command)
|
||||
while (wdcommand(du, cylin, head, sector, count1, command)
|
||||
!= 0) {
|
||||
wderror(bp, du,
|
||||
"wdstart: timeout waiting to give command");
|
||||
|
|
|
|||
Loading…
Reference in a new issue