Project

General

Profile

Submit #2875 » 0001-sys-sysids.h-Move-part_type-structure-to-the-sys-sys.patch

Anonymous, 12/26/2015 10:56 PM

View differences:

sbin/fdisk/fdisk.c
26 26
 * $FreeBSD: /repoman/r/ncvs/src/sbin/i386/fdisk/fdisk.c,v 1.36.2.14 2004/01/30 14:40:47 harti Exp $
27 27
 */
28 28

  
29
#include <sys/sysids.h>
29 30
#include <sys/param.h>
30 31
#include <sys/diskslice.h>
31 32
#include <sys/diskmbr.h>
......
124 125
static char *f_flag = NULL;	/* Read config info from file */
125 126
static int v_flag  = 0;		/* Be verbose */
126 127

  
127
struct part_type
128
{
129
 unsigned char type;
130
 const char *name;
131
}part_types[] =
132
{
133
	 {0x00, "unused"}
134
	,{0x01, "Primary DOS with 12 bit FAT"}
135
	,{0x02, "XENIX / filesystem"}
136
	,{0x03, "XENIX /usr filesystem"}
137
	,{0x04, "Primary DOS with 16 bit FAT (<= 32MB)"}
138
	,{0x05, "Extended DOS"}
139
	,{0x06, "Primary 'big' DOS (> 32MB)"}
140
	,{0x07, "OS/2 HPFS, NTFS, QNX-2 (16 bit) or Advanced UNIX"}
141
	,{0x08, "AIX filesystem"}
142
	,{0x09, "AIX boot partition or Coherent"}
143
	,{0x0A, "OS/2 Boot Manager or OPUS"}
144
	,{0x0B, "DOS or Windows 95 with 32 bit FAT"}
145
	,{0x0C, "DOS or Windows 95 with 32 bit FAT, LBA"}
146
	,{0x0E, "Primary 'big' DOS (> 32MB, LBA)"}
147
	,{0x0F, "Extended DOS, LBA"}
148
	,{0x10, "OPUS"}
149
	,{0x11, "OS/2 BM: hidden DOS with 12-bit FAT"}
150
	,{0x12, "Compaq diagnostics"}
151
	,{0x14, "OS/2 BM: hidden DOS with 16-bit FAT (< 32MB)"}
152
	,{0x16, "OS/2 BM: hidden DOS with 16-bit FAT (>= 32MB)"}
153
	,{0x17, "OS/2 BM: hidden IFS (e.g. HPFS)"}
154
	,{0x18, "AST Windows swapfile"}
155
	,{0x24, "NEC DOS"}
156
	,{0x39, "plan9"}
157
	,{0x3C, "PartitionMagic recovery"}
158
	,{0x40, "VENIX 286"}
159
	,{0x41, "Linux/MINIX (sharing disk with DRDOS)"}
160
	,{0x42, "SFS or Linux swap (sharing disk with DRDOS)"}
161
	,{0x43, "Linux native (sharing disk with DRDOS)"}
162
	,{0x4D, "QNX 4.2 Primary"}
163
	,{0x4E, "QNX 4.2 Secondary"}
164
	,{0x4F, "QNX 4.2 Tertiary"}
165
	,{0x50, "DM"}
166
	,{0x51, "DM"}
167
	,{0x52, "CP/M or Microport SysV/AT"}
168
	,{0x53, "DM6 Aux3"}
169
	,{0x54, "DM6"}
170
	,{0x55, "EZ-Drive (disk manager)"}
171
	,{0x56, "GB"}
172
	,{0x5C, "Priam Edisk (disk manager)"} /* according to S. Widlake */
173
	,{0x61, "Speed"}
174
	,{0x63, "ISC UNIX, other System V/386, GNU HURD or Mach"}
175
	,{0x64, "Novell Netware 2.xx"}
176
	,{0x65, "Novell Netware 3.xx"}
177
	,{0x70, "DiskSecure Multi-Boot"}
178
	,{0x75, "PCIX"}
179
	,{0x77, "QNX4.x"}
180
	,{0x78, "QNX4.x 2nd part"}
181
	,{0x79, "QNX4.x 3rd part"}
182
	,{0x80, "Minix 1.1 ... 1.4a"}
183
	,{0x81, "Minix 1.4b ... 1.5.10"}
184
	,{0x82, "Linux swap or Solaris x86"}
185
	,{0x83, "Linux filesystem"}
186
	,{0x84, "OS/2 hidden C: drive"}
187
	,{0x85, "Linux extended"}
188
	,{0x86, "NTFS volume set??"}
189
	,{0x87, "NTFS volume set??"}
190
	,{0x93, "Amoeba filesystem"}
191
	,{0x94, "Amoeba bad block table"}
192
	,{0x9F, "BSD/OS"}
193
	,{0xA0, "Suspend to Disk"}
194
	,{0xA5, "DragonFly/FreeBSD/NetBSD/386BSD"}
195
	,{0xA6, "OpenBSD"}
196
	,{0xA7, "NEXTSTEP"}
197
	,{0xA9, "NetBSD"}
198
	,{0xAC, "IBM JFS"}
199
	,{0xB7, "BSDI BSD/386 filesystem"}
200
	,{0xB8, "BSDI BSD/386 swap"}
201
	,{0xBE, "Solaris x86 boot"}
202
	,{0xC1, "DRDOS/sec with 12-bit FAT"}
203
	,{0xC4, "DRDOS/sec with 16-bit FAT (< 32MB)"}
204
	,{0xC6, "DRDOS/sec with 16-bit FAT (>= 32MB)"}
205
	,{0xC7, "Syrinx"}
206
	,{0xDB, "Concurrent CPM or C.DOS or CTOS"}
207
	,{0xE1, "Speed"}
208
	,{0xE3, "Speed"}
209
	,{0xE4, "Speed"}
210
	,{0xEB, "BeOS file system"}
211
	,{0xEE, "EFI GPT"}
212
	,{0xEF, "EFI System Partition"}
213
	,{0xF1, "Speed"}
214
	,{0xF2, "DOS 3.3+ Secondary"}
215
	,{0xF4, "Speed"}
216
	,{0xFE, "SpeedStor >1024 cyl. or LANstep"}
217
	,{0xFF, "BBT (Bad Blocks Table)"}
218
};
219

  
220 128
static void print_s0(int which);
221 129
static void print_part(int i);
222 130
static void init_sector0(unsigned long start);
usr.sbin/installer/libinstaller/sysids.h → sys/sys/sysids.h
24 24
 * the rights to redistribute these changes.
25 25
 *
26 26
 * $FreeBSD: /repoman/r/ncvs/src/sbin/i386/fdisk/fdisk.c,v 1.36.2.14 2004/01/30 14:40:47 harti Exp $
27
 * $_DragonFly: src/sbin/i386/fdisk/fdisk.c,v 1.9 2004/07/08 17:50:46 cpressey Exp $
28 27
 */
29 28

  
30 29
/*
......
37 36
 */
38 37

  
39 38
/*
40
 * sysids.h
39
 * sys/sysids.h
41 40
 * $Id: sysids.h,v 1.2 2005/02/06 21:05:18 cpressey Exp $
41
 *
42 42
 */
43 43

  
44
#ifndef _SYS_SYSIDS_H_
45
#define _SYS_SYSIDS_H_
46

  
44 47
static struct part_type
45 48
{
46 49
	unsigned char type;
......
133 136
	,{0xFE, "SpeedStor >1024 cyl. or LANstep"}
134 137
	,{0xFF, "BBT (Bad Blocks Table)"}
135 138
};
139

  
140
#endif /* !_SYS_SYSIDS_H_ */
usr.sbin/installer/libinstaller/diskutil.c
55 55

  
56 56
#include "commands.h"
57 57
#include "functions.h"
58
#include "sysids.h"
59 58
#include "uiutil.h"
60 59

  
60
#include <sys/sysids.h>
61

  
61 62
static int	disk_description_is_better(const char *, const char *);
62 63

  
63 64
/** STORAGE DESCRIPTORS **/
64
- 
    (1-1/1)