rebase from trunk
This commit is contained in:
Ben Gras
parent
a236a39e33
commit
8a0ab8630c
@ -33,8 +33,8 @@ Created: Jan 2000 by Philip Homburg <philip@cs.vu.nl>
|
||||
#include <string.h>
|
||||
#include <minix/sysutil.h>
|
||||
|
||||
#define NR_PCIBUS 10
|
||||
#define NR_PCIDEV 40
|
||||
#define NR_PCIBUS 40
|
||||
#define NR_PCIDEV 50
|
||||
|
||||
#define PBT_INTEL_HOST 1
|
||||
#define PBT_PCIBRIDGE 2
|
||||
@ -1135,16 +1135,24 @@ int bar_nr;
|
||||
{
|
||||
int reg, prefetch, type, dev_bar_nr;
|
||||
u32_t bar, bar2;
|
||||
u16_t cmd;
|
||||
|
||||
reg= PCI_BAR+4*bar_nr;
|
||||
|
||||
bar= pci_attr_r32_u(devind, reg);
|
||||
if (bar & PCI_BAR_IO)
|
||||
{
|
||||
/* Size register */
|
||||
/* Disable I/O access before probing for BAR's size */
|
||||
cmd = pci_attr_r16(devind, PCI_CR);
|
||||
pci_attr_w16(devind, PCI_CR, cmd & ~PCI_CR_IO_EN);
|
||||
|
||||
/* Probe BAR's size */
|
||||
pci_attr_w32(devind, reg, 0xffffffff);
|
||||
bar2= pci_attr_r32_u(devind, reg);
|
||||
|
||||
/* Restore original state */
|
||||
pci_attr_w32(devind, reg, bar);
|
||||
pci_attr_w16(devind, PCI_CR, cmd);
|
||||
|
||||
bar &= ~(u32_t)3; /* Clear non-address bits */
|
||||
bar2 &= ~(u32_t)3;
|
||||
@ -1168,10 +1176,17 @@ int bar_nr;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Size register */
|
||||
/* Disable mem access before probing for BAR's size */
|
||||
cmd = pci_attr_r16(devind, PCI_CR);
|
||||
pci_attr_w16(devind, PCI_CR, cmd & ~PCI_CR_MEM_EN);
|
||||
|
||||
/* Probe BAR's size */
|
||||
pci_attr_w32(devind, reg, 0xffffffff);
|
||||
bar2= pci_attr_r32_u(devind, reg);
|
||||
|
||||
/* Restore original values */
|
||||
pci_attr_w32(devind, reg, bar);
|
||||
pci_attr_w16(devind, PCI_CR, cmd);
|
||||
|
||||
if (bar2 == 0)
|
||||
return; /* Reg. is not implemented */
|
||||
@ -2398,7 +2413,7 @@ u32_t value;
|
||||
#if 0
|
||||
printf("pcii_wreg32(%d, %d, 0x%X, 0x%X): %d.%d.%d\n",
|
||||
busind, devind, port, value,
|
||||
pcibus[busind].pb_bus, pcidev[devind].pd_dev,
|
||||
pcibus[busind].pb_busnr, pcidev[devind].pd_dev,
|
||||
pcidev[devind].pd_func);
|
||||
#endif
|
||||
PCII_WREG32_(pcibus[busind].pb_busnr,
|
||||
|
||||
@ -9,6 +9,7 @@ Created: Jan 2000 by Philip Homburg <philip@cs.vu.nl>
|
||||
#define PCI_DID 0x02 /* Device ID, 16-bit */
|
||||
#define PCI_CR 0x04 /* Command Register, 16-bit */
|
||||
#define PCI_CR_MAST_EN 0x0004 /* Enable Busmaster Access */
|
||||
#define PCI_CR_MEM_EN 0x0002 /* Enable Mem Cycles */
|
||||
#define PCI_CR_IO_EN 0x0001 /* Enable I/O Cycles */
|
||||
#define PCI_SR 0x06 /* PCI status, 16-bit */
|
||||
#define PSR_SSE 0x4000 /* Signaled System Error */
|
||||
|
||||
@ -17,6 +17,6 @@ u64_t *newpos;
|
||||
m.m2_i2 = whence;
|
||||
if (_syscall(FS, LLSEEK, &m) < 0) return -1;
|
||||
if (newpos)
|
||||
*newpos= make64(m.m2_l2, m.m2_l1);
|
||||
*newpos= make64(m.m2_l1, m.m2_l2);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
.SH NAME
|
||||
ls \- list the contents of a directory
|
||||
.SH SYNOPSIS
|
||||
\fBls\fP [\fB\-acdfghilpqrstu1ACDFLMRTX\fP] [\fIname\fP...]
|
||||
\fBls\fP [\fB\-acdfghilnpqrstu1ACDFLMRTX\fP] [\fIname\fP...]
|
||||
.SH DESCRIPTION
|
||||
For each file argument, list it. For each directory argument, list its
|
||||
contents. The current working directory is listed when no files are named.
|
||||
@ -30,7 +30,7 @@ and
|
||||
.PP
|
||||
Files whose names start with a dot are by default not listed.
|
||||
.PP
|
||||
Note that standard MINIX 3 doesn't have symbolic links or sockets and
|
||||
Note that standard MINIX 3 doesn't have sockets, and
|
||||
.B \-u
|
||||
and
|
||||
.B \-c
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
|
||||
Welcome to MINIX 3.1.3.
|
||||
Welcome to MINIX 3.1.4.
|
||||
|
||||
This is an interim release, not final release quality. It is intended as
|
||||
a prerelease for developers.
|
||||
This snapshot is an interim release, not final release quality. It is
|
||||
intended as a prerelease for developers.
|
||||
|
||||
The system is now running and many commands work normally. To use MINIX
|
||||
in a serious way, you need to install it to your hard disk, which you
|
||||
@ -16,7 +16,6 @@ to begin installing the many software packages available. After you
|
||||
have installed the packages, type 'xdm' to start X Windows if you have
|
||||
installed it.
|
||||
|
||||
It is strongly recommended that you print and read the 'setup.pdf' file
|
||||
on the CD-ROM before staring the installation. The file is also
|
||||
available at www.minix3.org/doc under the 'Installation' heading.
|
||||
|
||||
Before you begin the installation process, it is strongly recommended
|
||||
that you print and carefully read the installation instructions
|
||||
available on the MINIX 3 website: http://www.minix3.org.
|
||||
|
||||
133
tools/package_sources.install
Normal file
133
tools/package_sources.install
Normal file
@ -0,0 +1,133 @@
|
||||
CSSC-1.0.1
|
||||
PopTart-0.9.7
|
||||
Xaw3d-1.5
|
||||
ackpack
|
||||
antiword-0.35
|
||||
apache-1.3.37
|
||||
apr-0.9.12
|
||||
apr-util-0.9.12
|
||||
ascii-3.8
|
||||
atk-1.9.0
|
||||
audio-1.0.0
|
||||
autoconf-2.59
|
||||
autoconf-2.60
|
||||
automake-1.9
|
||||
avra-0.7
|
||||
bash-3.0
|
||||
bc-1.06
|
||||
bchunk-1.2.0
|
||||
bcrypt-1.1
|
||||
bison-2.1
|
||||
catdoc-0.94.2
|
||||
cpio-2.5
|
||||
ctags-5.5.4
|
||||
cvs-1.11.21
|
||||
dact-0.8.39
|
||||
diffstat-1.39
|
||||
diffutils-2.8.1
|
||||
dungeon-2.7.1
|
||||
ede-1.1
|
||||
efltk-2.0.6
|
||||
elvis
|
||||
exim-4.66
|
||||
fb
|
||||
flawfinder-1.26
|
||||
flex-2.5.4
|
||||
flip-1.19
|
||||
fltk-1.1.7
|
||||
fltk-2.0.0-5220
|
||||
gawk-3.1.4
|
||||
gdbm-1.8.3
|
||||
gettext-0.14
|
||||
glib-1.2.10
|
||||
glib-2.10.0
|
||||
gnupg-1.4.8
|
||||
grep-2.5.1a
|
||||
groff-1.19.2
|
||||
gv-3.5.8
|
||||
gzip-1.2.4
|
||||
gzip-beta-1.3.3
|
||||
hexcat-0.0.3
|
||||
irssi-0.8.10
|
||||
jikes-1.22
|
||||
john-1.7.2
|
||||
jpeg-6b
|
||||
jwm-1.8
|
||||
kermit-2.1.1
|
||||
lcrack-20040914
|
||||
less-3.8.5
|
||||
lesstif-0.93.96
|
||||
libiconv-1.9.1
|
||||
libmcrypt-2.5.7
|
||||
libpng-1.2.8
|
||||
libungif-4.1.3
|
||||
libxml2-2.6.28
|
||||
links-2.1pre26
|
||||
lpr
|
||||
lynx2-8-5
|
||||
lzo-1.08
|
||||
lzop-1.01
|
||||
m4-1.4.3
|
||||
make-3.80
|
||||
mdf2iso
|
||||
mtools-3.9.7
|
||||
nano-1.3.12
|
||||
nasm-0.98.38
|
||||
nawk
|
||||
ncftp-3.1.9
|
||||
ncsa_httpd_1.4
|
||||
ncurses-5.5
|
||||
neon-0.25.5
|
||||
nethack-3.4.3-2
|
||||
netpbm-10.26.30
|
||||
nomarch-1.3
|
||||
nrg2iso-0.2
|
||||
nvi-1.79
|
||||
openssh-4.3p2
|
||||
openssl-0.9.8a
|
||||
patch-2.5.4
|
||||
pce-0.1.7
|
||||
pcre-4.5
|
||||
pdksh-5.2.14
|
||||
picasm112c
|
||||
pine-4.64
|
||||
pkg-config-0.20
|
||||
prng-3.0.2
|
||||
pscan-1.1
|
||||
pstotext-1.9
|
||||
psutils
|
||||
python-2.4.3
|
||||
rcs-5.7
|
||||
readline-5.1
|
||||
rman-3.2
|
||||
robodoc-4.0.18
|
||||
rsync-2.6.7
|
||||
screen-4.0.2
|
||||
sed-3.02
|
||||
shhmsg-1.4.1
|
||||
simhv35-2
|
||||
sip-0.4
|
||||
slang-1.4.9
|
||||
slrn-0.9.8.1
|
||||
sqlite-3.3.17
|
||||
src2tex-2.12
|
||||
ssmtp-2.61
|
||||
subversion-1.4.0
|
||||
tcl8.4.14
|
||||
texinfo-4.7
|
||||
tiff-3.8.2
|
||||
tk8.4.14
|
||||
unrtf-0.19.3
|
||||
unzip-5.52
|
||||
vice-1.19
|
||||
vice-1.20
|
||||
vile-9.4
|
||||
vim-6.3
|
||||
wdiff-0.5
|
||||
webcpp-0.8.4
|
||||
wget-1.5.3
|
||||
whichman-2.4
|
||||
xv-3.10a
|
||||
zip-2.31
|
||||
zlib-1.2.3
|
||||
zsh-4.2.6
|
||||
120
tools/packages.install
Normal file
120
tools/packages.install
Normal file
@ -0,0 +1,120 @@
|
||||
CSSC-1.0.1
|
||||
ImageMagick-6.3.1
|
||||
MPlayer-1.0rc1
|
||||
PopTart-0.9.7
|
||||
X11R6.8.2
|
||||
Xaw3d-1.5
|
||||
ackpack
|
||||
antiword-0.35
|
||||
apache-1.3.37
|
||||
apr-0.9.12
|
||||
apr-util-0.9.12
|
||||
ascii-3.8
|
||||
atk-1.9.0
|
||||
audio-1.0.0
|
||||
autoconf-2.59
|
||||
autoconf-2.60
|
||||
automake-1.9
|
||||
avra-0.7
|
||||
bash-3.0
|
||||
bc-1.06
|
||||
bchunk-1.2.0
|
||||
bcrypt-1.1
|
||||
binutils-2.16.1
|
||||
bison-2.1
|
||||
catdoc-0.94.2
|
||||
cvs-1.11.21
|
||||
diffutils-2.8.1
|
||||
dungeon-2.7.1
|
||||
ede-1.1
|
||||
efltk-2.0.6
|
||||
elvis
|
||||
emacs-21.4
|
||||
exim-4.66
|
||||
fb
|
||||
flawfinder-1.26
|
||||
flex-2.5.4
|
||||
fltk-1.1.7
|
||||
fltk-2.0.0-5220
|
||||
gawk-3.1.4
|
||||
gcc-4.1.1-libs
|
||||
gcc-4.1.1
|
||||
gettext-0.14
|
||||
ghostscript-8.54-gpl
|
||||
ghostscript-fonts-std-8.11
|
||||
glib-1.2.10
|
||||
gnu-coreutils-5.2.1
|
||||
gnupg-1.4.8
|
||||
grep-2.5.1a
|
||||
groff-1.19.2
|
||||
gv-3.5.8
|
||||
gzip-1.2.4
|
||||
hexcat-0.0.3
|
||||
irssi-0.8.10
|
||||
jikes-1.22
|
||||
john-1.7.2
|
||||
jpeg-6b
|
||||
jwm-1.8
|
||||
kermit-2.1.1
|
||||
lcrack-20040914
|
||||
less-3.8.5
|
||||
lesstif-0.93.96
|
||||
libiconv-1.9.1
|
||||
libpng-1.2.8
|
||||
libxml2-2.6.28
|
||||
links-2.1pre26
|
||||
lpr
|
||||
lynx2-8-5
|
||||
m4-1.4.3
|
||||
make-3.80
|
||||
mdf2iso
|
||||
mtools-3.9.7
|
||||
nano-1.3.12
|
||||
nawk
|
||||
ncftp-3.1.9
|
||||
ncurses-5.5
|
||||
neon-0.25.5
|
||||
nethack-3.4.3-2
|
||||
nomarch-1.3
|
||||
nvi-1.79
|
||||
openssh-4.3p2
|
||||
openssl-0.9.8a
|
||||
patch-2.5.4
|
||||
pce-0.1.7
|
||||
pdksh-5.2.14
|
||||
perl-5.8.7
|
||||
php-5.2.1
|
||||
pine-4.64
|
||||
pkg-config-0.20
|
||||
psutils
|
||||
python-2.4.3
|
||||
rcs-5.7
|
||||
readline-5.1
|
||||
rman-3.2
|
||||
rsync-2.6.7
|
||||
screen-4.0.2
|
||||
sed-3.02
|
||||
shhmsg-1.4.1
|
||||
simhv35-2
|
||||
sip-0.4
|
||||
slang-1.4.9
|
||||
slrn-0.9.8.1
|
||||
sqlite-3.3.17
|
||||
ssmtp-2.61
|
||||
subversion-1.4.0
|
||||
tcl8.4.14
|
||||
texinfo-4.7
|
||||
tiff-3.8.2
|
||||
tk8.4.14
|
||||
unrtf-0.19.3
|
||||
unzip-5.52
|
||||
vice-1.20
|
||||
vile-9.4
|
||||
vim-6.3
|
||||
webcpp-0.8.4
|
||||
wget-1.5.3
|
||||
whichman-2.4
|
||||
xv-3.10a
|
||||
zip-2.31
|
||||
zlib-1.2.3
|
||||
zsh-4.2.6
|
||||
@ -11,6 +11,10 @@ TMPKB=32000
|
||||
|
||||
PACKAGEDIR=/usr/bigports/Packages
|
||||
PACKAGESOURCEDIR=/usr/bigports/Sources
|
||||
# List of packages included on installation media
|
||||
PACKAGELIST=packages.install
|
||||
# List of package source included on installation media
|
||||
PACKAGESOURCELIST=package_sources.install
|
||||
secs=`expr 32 '*' 64`
|
||||
export SHELL=/bin/sh
|
||||
|
||||
@ -137,7 +141,7 @@ do
|
||||
done
|
||||
|
||||
if [ ! "$USRMB" ]
|
||||
then USRMB=120
|
||||
then USRMB=550
|
||||
fi
|
||||
|
||||
echo $USRMB MB
|
||||
@ -206,24 +210,37 @@ cp -rp /usr/lib $RELEASEDIR/usr
|
||||
cp -rp /bin/bigsh /bin/sh /bin/echo $RELEASEDIR/bin
|
||||
cp -rp /usr/bin/make /usr/bin/install /usr/bin/yacc /usr/bin/flex $RELEASEDIR/usr/bin
|
||||
|
||||
if [ -d $PACKAGEDIR -a -d $PACKAGESOURCEDIR -a $PACKAGES -ne 0 ]
|
||||
if [ -d $PACKAGEDIR -a -d $PACKAGESOURCEDIR -a -f $PACKAGELIST -a -f $PACKAGESOURCELIST -a $PACKAGES -ne 0 ]
|
||||
then echo " * Indexing packages"
|
||||
bintotal=0
|
||||
( cd $PACKAGEDIR
|
||||
for p in *.tar.bz2
|
||||
( for p in `cat $PACKAGELIST`
|
||||
do
|
||||
p="`echo $p | sed 's/.tar.bz2//'`"
|
||||
descr="../$p/.descr"
|
||||
descr="$PACKAGEDIR/../$p/.descr"
|
||||
if [ -f "$descr" ]
|
||||
then echo "$p|`cat $descr`"
|
||||
fi
|
||||
done | tee List
|
||||
done | tee $RELEASEPACKAGE/List
|
||||
)
|
||||
echo " * Transfering $PACKAGEDIR to $RELEASEPACKAGE"
|
||||
cp $PACKAGEDIR/* $RELEASEPACKAGE/
|
||||
for p in `cat $PACKAGELIST`
|
||||
do
|
||||
if [ -f $PACKAGEDIR/$p.tar.bz2 ]
|
||||
then
|
||||
cp $PACKAGEDIR/$p.tar.bz2 $RELEASEPACKAGE/
|
||||
else
|
||||
echo "Can't copy $PACKAGEDIR/$p.tar.bz2. Missing."
|
||||
fi
|
||||
done
|
||||
echo " * Transfering $PACKAGESOURCEDIR to $RELEASEPACKAGESOURCES"
|
||||
cp $PACKAGESOURCEDIR/* $RELEASEPACKAGESOURCES/ || true
|
||||
|
||||
for p in `cat $PACKAGESOURCELIST`
|
||||
do
|
||||
if [ -f $PACKAGESOURCEDIR/$p.tar.bz2 ]
|
||||
then
|
||||
cp $PACKAGESOURCEDIR/$p.tar.bz2 $RELEASEPACKAGESOURCES/
|
||||
else
|
||||
echo "Can't copy $PACKAGESOURCEDIR/$p.tar.bz2. Missing."
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# Make sure compilers and libraries are bin-owned
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user