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

Throw out obsolete Atari, Macintosh and Sun code to un-break packages;

Browse source 
credits to Sernin van de Krol's zip-2.31 patch for showing this problem
This commit is contained in:
Erik van der Kouwe 2010-02-16 19:19:42 +00:00
parent b706112487
commit 5af2471a9a
5 changed files with 1 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
commands/mdb/mdb.h
View file

@ -51,12 +51,8 @@
#if (CHIP == M68000) #if (CHIP == M68000)
#define __mc68000__ /* controls processor-dependent stuff */ #define __mc68000__ /* controls processor-dependent stuff */
#if (MACHINE == ATARI)
#define MINIX_ST /* controls system-dependent stuff */
#else
#error "only the MINIX_ST 1.5.x implementation works on 68K's" #error "only the MINIX_ST 1.5.x implementation works on 68K's"
#endif #endif
#endif
#if (CHIP == INTEL) #if (CHIP == INTEL)
#if (MACHINE == IBM_PC) #if (MACHINE == IBM_PC)

15
commands/simple/mkfs.c
View file

@ -66,10 +66,6 @@ maybedefine O_RDONLY 4 /* O_RDONLY | BINARY_BIT */
maybedefine BWRITE 5 /* O_WRONLY | BINARY_BIT */ maybedefine BWRITE 5 /* O_WRONLY | BINARY_BIT */
#endif #endif
#if (MACHINE == ATARI)
int isdev;
#endif
extern char *optarg; extern char *optarg;
extern int optind; extern int optind;
@ -1504,17 +1500,6 @@ char *string;
close(fd); close(fd);
fd = open(string, O_RDWR); fd = open(string, O_RDWR);
if (fd < 0) pexit("Can't open special file"); if (fd < 0) pexit("Can't open special file");
#if (MACHINE == ATARI)
{
struct stat statbuf;
if (fstat(fd, &statbuf) < 0) return;
isdev = (statbuf.st_mode & S_IFMT) == S_IFCHR
||
(statbuf.st_mode & S_IFMT) == S_IFBLK
;
}
#endif
} }

33
commands/simple/origmkfs.c
View file

@ -69,10 +69,6 @@ maybedefine O_RDONLY 4 /* O_RDONLY | BINARY_BIT */
maybedefine BWRITE 5 /* O_WRONLY | BINARY_BIT */ maybedefine BWRITE 5 /* O_WRONLY | BINARY_BIT */
#endif #endif
#if (MACHINE == ATARI)
int isdev;
#endif
extern char *optarg; extern char *optarg;
extern int optind; extern int optind;
@ -297,24 +293,6 @@ char *argv[];
cache_init(); cache_init();
#if (MACHINE == ATARI)
if (isdev) {
char block0[BLOCK_SIZE];
get_block((block_t) 0, block0);
/* Need to read twice; first time gets an empty block */
get_block((block_t) 0, block0);
/* Zero parts of the boot block so the disk won't be
* recognized as a tos disk any more. */
block0[0] = block0[1] = 0; /* branch code to boot code */
strncpy(&block0[2], "MINIX ", (size_t) 6);
block0[16] = 0; /* number of FATS */
block0[17] = block0[18] = 0; /* number of dir entries */
block0[22] = block0[23] = 0; /* sectors/FAT */
bzero(&block0[30], 480);/* boot code */
put_block((block_t) 0, block0);
} else
#endif
put_block((block_t) 0, zero); /* Write a null boot block. */ put_block((block_t) 0, zero); /* Write a null boot block. */
zone_shift = 0; /* for future use */ zone_shift = 0; /* for future use */
@ -1306,17 +1284,6 @@ char *string;
close(fd); close(fd);
fd = open(string, O_RDWR); fd = open(string, O_RDWR);
if (fd < 0) pexit("Can't open special file"); if (fd < 0) pexit("Can't open special file");
#if (MACHINE == ATARI)
{
struct stat statbuf;
if (fstat(fd, &statbuf) < 0) return;
isdev = (statbuf.st_mode & S_IFMT) == S_IFCHR
||
(statbuf.st_mode & S_IFMT) == S_IFBLK
;
}
#endif
} }

4
include/minix/config.h
View file

@ -25,10 +25,6 @@
#define MACHINE _MINIX_MACHINE #define MACHINE _MINIX_MACHINE
#define IBM_PC _MACHINE_IBM_PC #define IBM_PC _MACHINE_IBM_PC
#define SUN_4 _MACHINE_SUN_4
#define SUN_4_60 _MACHINE_SUN_4_60
#define ATARI _MACHINE_ATARI
#define MACINTOSH _MACHINE_MACINTOSH
/* Number of slots in the process table for non-kernel processes. The number /* Number of slots in the process table for non-kernel processes. The number
* of system processes defines how many processes with special privileges * of system processes defines how many processes with special privileges

18
include/minix/sys_config.h
View file

@ -7,10 +7,6 @@
#define _MINIX_MACHINE _MACHINE_IBM_PC #define _MINIX_MACHINE _MACHINE_IBM_PC
#define _MACHINE_IBM_PC 1 /* any 8088 or 80x86-based system */ #define _MACHINE_IBM_PC 1 /* any 8088 or 80x86-based system */
#define _MACHINE_SUN_4 40 /* any Sun SPARC-based system */
#define _MACHINE_SUN_4_60 40 /* Sun-4/60 (aka SparcStation 1 or Campus) */
#define _MACHINE_ATARI 60 /* ATARI ST/STe/TT (68000/68030) */
#define _MACHINE_MACINTOSH 62 /* Apple Macintosh (68000) */
/* Word size in bytes (a constant equal to sizeof(int)). */ /* Word size in bytes (a constant equal to sizeof(int)). */
#if __ACK__ || __GNUC__ #if __ACK__ || __GNUC__
@ -37,20 +33,6 @@
#define _MINIX_CHIP _CHIP_INTEL #define _MINIX_CHIP _CHIP_INTEL
#endif #endif
#if (_MINIX_MACHINE == _MACHINE_ATARI) || (_MINIX_MACHINE == _MACHINE_MACINTOSH)
#define _MINIX_CHIP _CHIP_M68000
#endif
#if (_MINIX_MACHINE == _MACHINE_SUN_4) || (_MINIX_MACHINE == _MACHINE_SUN_4_60)
#define _MINIX_CHIP _CHIP_SPARC
#define _MINIX_FP_FORMAT _FP_IEEE
#endif
#if (_MINIX_MACHINE == _MACHINE_ATARI) || (_MINIX_MACHINE == _MACHINE_SUN_4)
#define _ASKDEV 1 /* ask for boot device */
#define _FASTLOAD 1 /* use multiple block transfers to init ram */
#endif
#ifndef _MINIX_FP_FORMAT #ifndef _MINIX_FP_FORMAT
#define _MINIX_FP_FORMAT _FP_NONE #define _MINIX_FP_FORMAT _FP_NONE
#endif #endif