mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- applied patch (GZIP variable in Makefile renamed)

Browse Source 
- applied patch 1021767 (sb16ctrl.c now compiles on all unix platforms)
This commit is contained in:
Volker Ruppert 2004-09-04 08:24:40 +00:00
parent e5761d230c
commit defdbda939
3 changed files with 13 additions and 9 deletions

3
bochs/CHANGES

@ -70,6 +70,7 @@ Changes to next release:
- int13_cdrom / 32 bit register update fixes for FreeBSD cdrom boot
(Fabrice Bellard)
- APM and system shutdown support (Fabrice Bellard)
- checksum calculation for expansion ROMs
- display libraries
- status bar with indicators for cdrom, floppy, harddisk and keyboard added
@ -118,6 +119,8 @@ Changes to next release:
[961665] WinXP patch to read physical CDROM's TOC by Ben Lunt
[978793] CDROM_SENSE_MODE medium_type by Ben Lunt
[615457] gif to png migration
[1021767] Portability in sb16ctrl.c by Robert Millan
[690400] gzip is confused by GZIP variable in Makefile
- SF patches partially applied
[896733] Lazy flags, for more instructions, only 1 src op

13
bochs/Makefile.in

@ -70,7 +70,8 @@ MKDIR=mkdir
RMDIR=rmdir
TAR=tar
CHMOD=chmod
GZIP=gzip -9
# the GZIP variable is reserved by gzip program
GZIP_BIN=gzip -9
GUNZIP=gunzip
ZIP=zip
UNIX2DOS=unix2dos
@ -245,7 +246,7 @@ $(BX_OBJS): $(BX_INCLUDES)
bxversion.h:
$(RM) -f bxversion.h
echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h
echo '// $$Id: Makefile.in,v 1.165 2004-06-19 11:13:21 vruppert Exp $$' >> bxversion.h
echo '// $$Id: Makefile.in,v 1.166 2004-09-04 08:24:40 vruppert Exp $$' >> bxversion.h
echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h
echo '// This file is generated by "make bxversion.h"' >> bxversion.h
echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h
@ -389,8 +390,8 @@ install_docbook: build_docbook
install_man::
-mkdir -p $(DESTDIR)$(man1dir)
-mkdir -p $(DESTDIR)$(man5dir)
for i in $(MAN_PAGE_1_LIST); do cat $(srcdir)/doc/man/$$i.1 | $(SED) 's/@version@/$(VERSION)/g' | $(GZIP) -c > $(DESTDIR)$(man1dir)/$$i.1.gz; chmod 644 $(DESTDIR)$(man1dir)/$$i.1.gz; done
for i in $(MAN_PAGE_5_LIST); do cat $(srcdir)/doc/man/$$i.5 | $(GZIP) -c > $(DESTDIR)$(man5dir)/$$i.5.gz; chmod 644 $(DESTDIR)$(man5dir)/$$i.5.gz; done
for i in $(MAN_PAGE_1_LIST); do cat $(srcdir)/doc/man/$$i.1 | $(SED) 's/@version@/$(VERSION)/g' | $(GZIP_BIN) -c > $(DESTDIR)$(man1dir)/$$i.1.gz; chmod 644 $(DESTDIR)$(man1dir)/$$i.1.gz; done
for i in $(MAN_PAGE_5_LIST); do cat $(srcdir)/doc/man/$$i.5 | $(GZIP_BIN) -c > $(DESTDIR)$(man5dir)/$$i.5.gz; chmod 644 $(DESTDIR)$(man5dir)/$$i.5.gz; done
download_dlx: $(DLXLINUX_TAR)
@ -409,7 +410,7 @@ install_dlx:
$(RM) -rf $(DESTDIR)$(sharedir)/dlxlinux
cp -r dlxlinux $(DESTDIR)$(sharedir)/dlxlinux
$(CHMOD) 755 $(DESTDIR)$(sharedir)/dlxlinux
$(GZIP) $(DESTDIR)$(sharedir)/dlxlinux/hd10meg.img
$(GZIP_BIN) $(DESTDIR)$(sharedir)/dlxlinux/hd10meg.img
$(CHMOD) 644 $(DESTDIR)$(sharedir)/dlxlinux/*
for i in bochs-dlx; do cp $(srcdir)/build/linux/$$i $(bindir)/$$i; $(CHMOD) 755 $(DESTDIR)$(bindir)/$$i; done
@ -443,7 +444,7 @@ win32_snap:
$(SHELL) ./build/win32/cpp2cc
tar:
NAME=`pwd|$(SED) 's/.*\///'`; (cd ..; $(RM) -f $$NAME.zip; tar cf - $$NAME | $(GZIP) > $$NAME.tar.gz); ls -l ../$$NAME.tar.gz
NAME=`pwd|$(SED) 's/.*\///'`; (cd ..; $(RM) -f $$NAME.zip; tar cf - $$NAME | $(GZIP_BIN) > $$NAME.tar.gz); ls -l ../$$NAME.tar.gz
zip:
NAME=`pwd|$(SED) 's/.*\///'`; (cd ..; $(RM) -f $$NAME.zip; $(ZIP) $$NAME.zip -r $$NAME -x \*CVS\* -x \*.cvsignore ); ls -l ../$$NAME.zip

6
bochs/misc/sb16/sb16ctrl.c

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: sb16ctrl.c,v 1.3 2001-10-03 13:10:38 bdenney Exp $
// $Id: sb16ctrl.c,v 1.4 2004-09-04 08:24:40 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -43,7 +43,7 @@
# include <dos.h>
#endif
#ifdef linux
#ifdef __unix__
# include <sys/io.h>
# include <errno.h>
# define inp inb
@ -80,7 +80,7 @@ void writeemul(int value)
/* Enable access to the emulator port */
void enableport()
{
#ifdef linux
#ifdef __unix__
if (ioperm(EMULPORT, 1, 1)) {
printf("Could not access emulator port %03x: %s.\n", EMULPORT, strerror(errno));
exit(1);