From 6c85bfafe8a90c563551f00c1590dd1cca67f27d Mon Sep 17 00:00:00 2001 From: Michael McMaster Date: Wed, 11 Sep 2013 15:28:00 +1000 Subject: [PATCH] Rename to hfdisk to make it clear this is a fork from the original --- HISTORY | 3 + Makefile | 12 +- changelog | 7 ++ copyright | 2 +- pdisk.8 => hfdisk.8 | 0 pdisk.c => hfdisk.c | 4 +- pdisk.h => hfdisk.h | 0 kernel-defs.h | 64 ----------- list.src | 34 ------ mac-fdisk.8.in | 262 -------------------------------------------- pdisk.r | 234 --------------------------------------- version.h | 8 +- 12 files changed, 23 insertions(+), 607 deletions(-) rename pdisk.8 => hfdisk.8 (100%) rename pdisk.c => hfdisk.c (99%) rename pdisk.h => hfdisk.h (100%) delete mode 100644 kernel-defs.h delete mode 100644 list.src delete mode 100644 mac-fdisk.8.in delete mode 100644 pdisk.r diff --git a/HISTORY b/HISTORY index 2e43b35..9dce2c6 100644 --- a/HISTORY +++ b/HISTORY @@ -14,3 +14,6 @@ 961220 Released version 0.3 to community 970115 Released version 0.4 (with Macintosh app) + +2013-09-11 + Forked mac-fdisk into hfdisk diff --git a/Makefile b/Makefile index c60dd5b..1c5b275 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,17 @@ CFLAGS=-std=gnu99 -all: pdisk +all: hfdisk -pdisk: pdisk.o dump.o partition_map.o convert.o io.o errors.o bitfield.o +hfdisk: hfdisk.o dump.o partition_map.o convert.o io.o errors.o bitfield.o clean: - rm -f *.o pdisk + rm -f *.o hfdisk convert.o: convert.c partition_map.h convert.h dump.o: dump.c io.h errors.h partition_map.h errors.o: errors.c errors.h -io.o: io.c pdisk.h io.h errors.h -partition_map.o: partition_map.c partition_map.h pdisk.h convert.h io.h errors.h -pdisk.o: pdisk.c pdisk.h io.h errors.h partition_map.h version.h +io.o: io.c hfdisk.h io.h errors.h +partition_map.o: partition_map.c partition_map.h hfdisk.h convert.h io.h errors.h +hfdisk.o: hfdisk.c hfdisk.h io.h errors.h partition_map.h version.h partition_map.h: dpme.h dpme.h: bitfield.h diff --git a/changelog b/changelog index 3921a46..cff137f 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,10 @@ +hfdisk (1.0) unstable; urgency=low + + * Forked mac-fdisk + * Rename pdisk to hfdisk + + -- Michael McMaster Wed, 11 Sep 2013 13:47:27 +1000 + mac-fdisk (0.1-16) unstable; urgency=low * Fix udeb shlib dependencies - patch by Frans Pop diff --git a/copyright b/copyright index 53d5a96..b3992ae 100644 --- a/copyright +++ b/copyright @@ -1,4 +1,4 @@ -This package was forked from the Debian mac-fdisk 0.1-16 package by +hfdisk was forked from the Debian mac-fdisk 0.1-16 package by Michael McMaster 2013. This package was debianized by Michael Schmitz schmitz@lcbvax.cchem.berkeley.edu on diff --git a/pdisk.8 b/hfdisk.8 similarity index 100% rename from pdisk.8 rename to hfdisk.8 diff --git a/pdisk.c b/hfdisk.c similarity index 99% rename from pdisk.c rename to hfdisk.c index 4098bf4..cb030a1 100644 --- a/pdisk.c +++ b/hfdisk.c @@ -1,5 +1,5 @@ // -// pdisk - an editor for Apple format partition tables +// hfdisk - an editor for Apple format partition tables // // Written by Eryk Vershen (eryk@apple.com) // @@ -36,7 +36,7 @@ #include -#include "pdisk.h" +#include "hfdisk.h" #include "io.h" #include "errors.h" #include "partition_map.h" diff --git a/pdisk.h b/hfdisk.h similarity index 100% rename from pdisk.h rename to hfdisk.h diff --git a/kernel-defs.h b/kernel-defs.h deleted file mode 100644 index 5f15fd4..0000000 --- a/kernel-defs.h +++ /dev/null @@ -1,64 +0,0 @@ -/* from asm/types.h */ -typedef unsigned short __u16; -typedef unsigned int __u32; - -/* from linux/hdreg.h */ -#define HDIO_GETGEO 0x0301 /* get device geometry */ - -struct hd_geometry { - unsigned char heads; - unsigned char sectors; - unsigned short cylinders; - unsigned long start; -}; - -/* from asm/ioctl.h */ -#define _IOC_NRBITS 8 -#define _IOC_TYPEBITS 8 -#define _IOC_SIZEBITS 13 -#define _IOC_DIRBITS 3 - -#define _IOC_NRMASK ((1 << _IOC_NRBITS)-1) -#define _IOC_TYPEMASK ((1 << _IOC_TYPEBITS)-1) -#define _IOC_SIZEMASK ((1 << _IOC_SIZEBITS)-1) -#define _IOC_DIRMASK ((1 << _IOC_DIRBITS)-1) - -#define _IOC_NRSHIFT 0 -#define _IOC_TYPESHIFT (_IOC_NRSHIFT+_IOC_NRBITS) -#define _IOC_SIZESHIFT (_IOC_TYPESHIFT+_IOC_TYPEBITS) -#define _IOC_DIRSHIFT (_IOC_SIZESHIFT+_IOC_SIZEBITS) - -#ifdef __powerpc__ -#define _IOC_NONE 1U -#define _IOC_READ 2U -#define _IOC_WRITE 4U -#else -#define _IOC_NONE 0U -#define _IOC_READ 2U -#define _IOC_WRITE 1U -#endif - -#define _IOC(dir,type,nr,size) \ - (((dir) << _IOC_DIRSHIFT) | \ - ((type) << _IOC_TYPESHIFT) | \ - ((nr) << _IOC_NRSHIFT) | \ - ((size) << _IOC_SIZESHIFT)) -#define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0) - -/* from linux/fs.h */ -#define BLKRRPART _IO(0x12,95) /* re-read partition table */ -#define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ - -/* from linux/genhd.h */ -struct partition { - unsigned char boot_ind; /* 0x80 - active */ - unsigned char head; /* starting head */ - unsigned char sector; /* starting sector */ - unsigned char cyl; /* starting cylinder */ - unsigned char sys_ind; /* What partition type */ - unsigned char end_head; /* end head */ - unsigned char end_sector; /* end sector */ - unsigned char end_cyl; /* end cylinder */ - unsigned int start_sect; /* starting sector counting from 0 */ - unsigned int nr_sects; /* nr of sectors in partition */ -} __attribute__((packed)); diff --git a/list.src b/list.src deleted file mode 100644 index 63288c5..0000000 --- a/list.src +++ /dev/null @@ -1,34 +0,0 @@ -pdisk/DoReadWrite.c -pdisk/DoSCSICommandWithSense.c -pdisk/DoTestUnitReady.c -pdisk/HISTORY -pdisk/MacSCSICommand.h -pdisk/README -pdisk/SCSIStuff.h -pdisk/SCSI_misc.c -pdisk/bitfield.c -pdisk/bitfield.h -pdisk/convert.c -pdisk/convert.h -pdisk/dpme.h -pdisk/dump.c -pdisk/dump.h -pdisk/errors.c -pdisk/errors.h -pdisk/io.c -pdisk/io.h -pdisk/list.src -pdisk/makefile -pdisk/partition_map.c -pdisk/partition_map.h -pdisk/pdisk.8 -pdisk/pdisk.c -pdisk/pdisk.h -pdisk/pdisk.r -pdisk/version.h -pdisk/pdisk.mac.bin - -pdisk/fdisk.c -pdisk/fdisk.h -pdisk/fdisklabel.c -pdisk/fdisklabel.h diff --git a/mac-fdisk.8.in b/mac-fdisk.8.in deleted file mode 100644 index 31e3643..0000000 --- a/mac-fdisk.8.in +++ /dev/null @@ -1,262 +0,0 @@ -.TH MAC-FDISK 8 "1 December 2001" "Debian" "Apple Disk Partitioning Manual" -.SH NAME -mac-fdisk \- Apple partition table editor for Linux -.SH SYNOPSIS -.B mac-fdisk -.B "[ \-h | \--help ] [ \-v | \--version ] [ \-l | \--list device ... ]" -.br -.B mac-fdisk -.B "[ \-r | \--readonly ] device ... " -.SH DESCRIPTION -.B mac-fdisk -is a command line type program which partitions disks using the standard Apple -disk partitioning scheme described in "Inside Macintosh: Devices". -The -.I device -is usually one of the following: - -.nf -.RS -/dev/sda -/dev/sdb -/dev/sdc -/dev/sdd -/dev/sde -/dev/sdf -/dev/sdg -/dev/hda -/dev/hdb - -.RE -.fi -/dev/sda is the first hard disk on the SCSI bus (i.e. the -one with the lowest id), /dev/sdb is the second hard disk, and so on. -The -.I partition -is a -.I device -name followed by a partition number. -The partition number is the index (starting from one) of the partition -map entry in the partition map (and the partition map itself occupies the -first entry). -For example, -.B /dev/sda2 -is the partition described by the second entry in the partiton map on /dev/sda. - -.SH OPTIONS -.TP -.B \-v | \--version -Prints version number of the -.B mac-fdisk -program. -.TP -.B \-h | \--help -Prints a list of available commands for the -.B mac-fdisk -program. -.TP -.B \-l | \--list -Lists the partition tables for the specified -.IR device(s). -With no -.IR device(s) -given, lists all SCSI and IDE devices found in the system. -.TP -.B \-r | \--readonly -Prevents -.B mac-fdisk -from writing to the device. -.SH "Editing Partition Tables" -An argument which is simply the name of a -.I device -indicates that -.B mac-fdisk -should edit the partition table of that device. Once started, -.B mac-fdisk -presents an interactive command prompt to edit the partition table. -The partition editing commands are: - -.nf -.RS -h list available commands -p print (list) the current edited partition table status -P print ordered by base address -i initialize the partition map -s change size of partition map -b create new 800K Apple_Bootstrap partition (used by yaboot) -c create new standard Linux type partition -C create new partition, specifying the partition type -d delete a partition -r reorder partition entry -w write the partition table to disk -q quit - -.RE -.fi -Commands which take arguments prompt for each argument in turn. -You can also type the arguments separated by spaces -and those prompts will be skipped. The -.B i -and -.B w -commands will prompt for confirmation. None of the editing you do will -actually affect the state of the disk you are partitioning until the -.B w -command is issued. Then the map in its edited state will be -permanently written to the disk. - -Partitions are always specified by their number, the index of the -partition entry in the partition map. Many commands will change the -index numbers of partitions which follow the affected partition; you are -encouraged to use the -.B p -command to print the partition table as frequently as necessary. For SCSI -disks, the partition table should not contain more than fifteen partitions -(partition map excluded). IDE disks have a limit of 31 partitions. - -Here is a more-or-less typical output for the print command: - -.nf -.RS -Command (? for help): p -/dev/sdb - # type name length base ( size ) system -/dev/sdb1 Apple_partition_map Apple 63 @ 1 ( 31.5k) Partition map -/dev/sdb2 Apple_Driver43 Macintosh 54 @ 64 ( 27.0k) Driver 4.3 -/dev/sdb3 Apple_Driver43 Macintosh 74 @ 118 ( 37.0k) Driver 4.3 -/dev/sdb4 Apple_Driver_IOKit Macintosh 512 @ 192 (256.0k) Unknown -/dev/sdb5 Apple_Patches Patch Partition 512 @ 704 (256.0k) Unknown -/dev/sdb6 Apple_HFS untitled 3072000 @ 1216 ( 1.5G) HFS -/dev/sdb7 Apple_HFS untitled 2 333026 @ 3073216 (162.6M) HFS -/dev/sdb8 Apple_Free Extra 10 @ 3406242 ( 5.0k) Free space - -Block size=512, Number of Blocks=3406252 -DeviceType=0x0, DeviceId=0x0 -Drivers- -1: @ 64 for 22, type=0x1 -2: @ 118 for 36, type=0xffff - -.RE -.fi - -The -.B i -(initialize) command prompts for the size of the device. You can just -type Return to accept the offered size, which should be correct. - -The -.B b -command is a shortcut to create the bootstrap partition used on PowerPC -NewWorld machines. It is equivalent to creating an 800k -.B Apple_Bootstrap -type partition using the -.B C -command described below. The sole purpose of this partition is to -store the boot loader. In multiboot environments, the first bootable -partition found on the disk takes precedence unless a specific boot -partition is set in OpenFirmware, so it's best to create the bootstrap -partition first, or move it to a position before any -.B Apple_HFS -or -.B Apple_Boot -partitions using the -.B r -command described below. Then you will still able to boot Linux after -the occasional OpenFirmware reset. - -The -.B c -(create new partition) command has three arguments. As mentioned -above you can type the arguments following the command, separated by -spaces, or respond to prompts for each argument: - - 1) The base address of the start of the partition. - - You can specify a number in blocks (most likely reading from the - existing partition map) or you can also type a partition number - followed by the letter 'p' to indicate that the new partition - should take the place of that existing free space partition. - - 2) The length of the partition. - - Again, you can specify a number in blocks or type a partition - number followed by the letter 'p' to indicate use of the entire - partition. You can also type a number followed by 'k', 'm', or - 'g' to indicate the size in kilobytes, megabytes, or gigabytes - respectively. (These are powers of 1024, of course, not powers - of 1000.) - - 3) The name of the partition. - - This can be a single word without quotes, or a string surrounded - by single or double quotes. It is best to name any swap partition - you create `swap'; other partition names are up to you. The names - are not visible to Linux. - -The -.B C -command is identical to the -.B c -command, with the addition of a partition type argument after the -other arguments. The partition type used for Linux swap and data partitons -is -.B APPLE_UNIX_SVR2 -(this is the partition type created by the -.B c -command). Under normal circumstances, you should not need to use this -command. - -The -.B d -command deletes the partition number specified, replacing that partition -with partitionable free space. - -The -.B r -(reorder) command allows the index number of partitions to be changed. -The index numbers are constrained to be a contiguous sequence. -.B mac-fdisk -will enforce this constraint by recalculating the partition numbers -after each insert, delete or reorder operation. OpenFirmware looks for -bootable partitions in the order specified by the index. The -partitions are not moved on the disk. This command takes two -arguments, the number of the partition to be moved and the partition -number it should become. - -The -.B w -command writes the partition map out to disk. Note that partition -maps for disks with mounted partitions cannot immediately be -reinterpreted by the kernel. In order to use the new partition map you -must reboot. Within the Debian installer system, -.B mac-fdisk -is normally invoked before any partitions are mounted, thus a reboot is not -necessary before continuing the installation. - -The -.B q -command terminates the program. If there was no -.B w -command issued during the program run, then there will be no effect on the disk. - -.SH BUGS -Some people believe there should really be just one disk partitioning utility. - -.B mac-fdisk -should be able to create HFS partitions that work. Currently, if a -pre-existing HFS partition is resized, MacOS will continue to use the -partition size stored in the HFS 'superblock' instead of using the size from -the partition table (the MacOS volume on the partition remains valid even -though the sizes don't match anymore). This can have undesired side effects -especially when creating a smaller HFS partition followed by a few Linux -partitions in place of the previous HFS partition space. To avoid this -issue, create MacOS partitions within MacOS and then don't resize them -in -.B mac-fdisk. - -.SH "SEE ALSO" -.BR fdisk (8), -.BR mkswap (8), -.BR mkfs (8) -.SH AUTHOR -Eryk Vershen (eryk@apple.com), man page revised by Chris Tillman (tillman@azstarnet.com) diff --git a/pdisk.r b/pdisk.r deleted file mode 100644 index 1e42dbb..0000000 --- a/pdisk.r +++ /dev/null @@ -1,234 +0,0 @@ -/* - * pdisk.r - */ - -/* - * Copyright 1997 by Apple Computer, Inc. - * All Rights Reserved - * - * Permission to use, copy, modify, and distribute this software and - * its documentation for any purpose and without fee is hereby granted, - * provided that the above copyright notice appears in all copies and - * that both the copyright notice and this permission notice appear in - * supporting documentation. - * - * APPLE COMPUTER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE. - * - * IN NO EVENT SHALL APPLE COMPUTER BE LIABLE FOR ANY SPECIAL, INDIRECT, OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT, - * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION - * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef SystemSevenOrLater -#define SystemSevenOrLater 1 -#endif -#include "Types.r" -#include "SysTypes.r" -#include "version.h" - - -resource 'vers' (1) { - kVersionMajor, - kVersionMinor*0x10 + kVersionBugFix, - kVersionStage, - kVersionDelta, - verUS, - VERSION, - $$format( - "%s (%02d%02d%02d)\n" - "© 1992-%4d Apple Computer Inc. All Rights Reserved", - VERSION, $$year % 100, $$month, $$day, - $$year - ), -}; - - -type 'PDSK' as 'STR '; -resource 'PDSK' (0, "Owner Resource", purgeable) { - $$format( - "pdisk\n© 1992-%4d Apple Computer Inc. All Rights Reserved.", - $$year - ) -}; - -resource 'BNDL' (128) { - 'PDSK', - 0, - { - 'FREF', { 0, 128 }, - 'ICN#', { 0, 128 } - } -}; - -resource 'FREF' (128) { - 'APPL', - 0, - "" -}; -resource 'icl8' (128) { - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 FFFF FFFF FFFF 0000 0000 0000 0000" - $"FF2B 2B2B 2B2B 2B2B 2B2B 2BFF 0000 0000" - $"00FF 0808 0808 0808 FF00 0000 0000 0000" - $"FF2B 2B2B 2B2B 2B2B 2B2B FF00 0000 0000" - $"FF08 0808 0808 0808 08FF 0000 0000 0000" - $"FFFC FCFC FCFC FCFC FCFC FF00 0000 00FF" - $"0808 FFFF 0808 0808 0808 FF00 0000 0000" - $"FF00 0000 0000 0000 0000 FF00 0000 00FF" - $"FFFF 0000 FF08 0808 0808 08FF 0000 0000" - $"FF2B 2B2B 2B2B 2B2B 2B2B FF00 FFFF FF08" - $"08FF FFFF FFFF FFFF FF08 0808 FFFF FFFF" - $"FF2B 2B2B 2B2B 2B2B 2B2B FF00 0000 FF08" - $"0808 FFFF 0808 0808 0808 0808 08FF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FF00 0000 00FF" - $"0808 0808 0808 0808 0808 0808 08FF FFFF" - $"00FF F7FC F7FC F7FC F7FF 0000 0000 0000" - $"FF08 0808 0808 0808 0808 0808 08FF FFFF" - $"00FF FFFF FBFB FBFF FFFF 0000 0000 0000" - $"00FF FF08 0808 0808 0808 0808 08FF FFFF" - $"0000 0000 FFFF FF00 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FF08 08FF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF FFFF" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 FF2B 2B2B 2B2B 2B2B" - $"2B2B 2B2B 2B2B FF00 0000 0000 0000 0000" - $"0000 0000 0000 00FF 2B2B 2B2B 2B2B 2B2B" - $"2B2B 2B2B 2B2B FF00 0000 0000 0000 0000" - $"0000 0000 0000 00FF FCFC FCFC FCFC FCFC" - $"FCFC FCFC FCFC FF00 0000 0000 0000 0000" - $"0000 0000 0000 00FF 0000 0000 0000 0000" - $"0000 0000 0000 FF00 0000 0000 0000 0000" - $"0000 0000 0000 00FF 2B2B 2B2B 2B2B 2B2B" - $"2B2B 2B2B 2BFF 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF 2B2B 2B2B 2B2B 2B2B" - $"2B2B 2B2B FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 FFFC F7FC F7FC F7FC F7FC" - $"F7FC F7FC FF00 00FF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 00FF 2B2B 2B2B 2B2B 2BFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF 2B2B 2B2B 2B2B 2BFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FCFC E3E3 E3FC FCFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF 0000 0000 0000 00FF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 FF2B 2B2B 2B2B 2B2B 2BFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 00FF 2B2B 2B2B 2B2B 2B2B 2BFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 00FF F7FC F7FC F7FC F7FC FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 00FF FFFF FFFB FBFB FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 00FF FFFF" -}; - -resource 'icl4' (128) { - $"FFFF FFFF FFFF 0000 00FF FFFF 0000 0000" - $"FCCC CCCC CCCF 0000 0F02 0202 F000 0000" - $"FCCC CCCC CCF0 0000 F020 2020 2F00 0000" - $"FEEE EEEE EEF0 000F 02FF 0202 02F0 0000" - $"F000 0000 00F0 000F FF00 F020 202F 0000" - $"FCCC CCCC CCF0 FFF2 0FFF FFFF F202 FFFF" - $"FCCC CCCC CCF0 00F0 20FF 2020 2020 2FFF" - $"FFFF FFFF FFF0 000F 0202 0202 0202 0FFF" - $"0FCE CECE CF00 0000 F020 2020 2020 2FFF" - $"0FFF EEEF FF00 0000 0FF2 0202 0202 0FFF" - $"0000 FFF0 0000 0000 000F FFFF FFF0 2FFF" - $"0000 0000 0000 0000 0000 0000 000F FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0FFF" - $"0000 0000 FFFF FFFF FFFF FFF0 0000 0000" - $"0000 0000 FCCC CCCC CCCC CCF0 0000 0000" - $"0000 000F CCCC CCCC CCCC CCF0 0000 0000" - $"0000 000F EEEE EEEE EEEE EEF0 0000 0000" - $"0000 000F 0000 0000 0000 00F0 0000 0000" - $"0000 000F CCCC CCCC CCCC CF00 0000 0000" - $"0000 000F CCCC CCCC CCCC F000 0000 0000" - $"0000 000F FFFF FFFF FFFF F000 0000 0000" - $"0000 00FE CECE CECE CECE F00F FFFF FFFF" - $"0000 00FF FFFF FFFF FFFF F00F CCCC CCCF" - $"0000 0000 0000 0000 0000 000F CCCC CCCF" - $"0000 0000 0000 0000 0000 000F EE88 8EEF" - $"0000 0000 0000 0000 0000 000F 0000 000F" - $"0000 0000 0000 0000 0000 00FC CCCC CCCF" - $"0000 0000 0000 0000 0000 0FCC CCCC CCCF" - $"0000 0000 0000 0000 0000 0FFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0FCE CECE CEF0" - $"0000 0000 0000 0000 0000 0FFF FEEE FFF0" - $"0000 0000 0000 0000 0000 0000 0FFF" -}; - -resource 'ICN#' (128) { - { -/* 1 */ $"FFF0 3F00 8010 4080 8020 8040 FFE1 3020" - $"8021 C810 802E 7F8F 8022 3007 FFE1 0007" - $"5540 8007 7FC0 6007 0E00 1FE7 0000 001F" - $"0000 0007 00FF FE00 0080 0200 0100 0200" - $"01FF FE00 0100 0200 0100 0400 0100 0800" - $"01FF F800 0355 59FF 03FF F901 0000 0101" - $"0000 01FF 0000 0101 0000 0201 0000 0401" - $"0000 07FF 0000 0556 0000 07FE 0000 0070", - -/* 2 */ $"FFF0 3F00 FFF0 7F80 FFE0 FFC0 FFE1 FFE0" - $"FFE1 FFF0 FFEF FFFF FFE3 FFFF FFE1 FFFF" - $"7FC0 FFFF 7FC0 7FFF 0E00 1FFF 0000 001F" - $"0000 0007 00FF FE00 00FF FE00 01FF FE00" - $"01FF FE00 01FF FE00 01FF FC00 01FF F800" - $"01FF F800 03FF F9FF 03FF F9FF 0000 01FF" - $"0000 01FF 0000 01FF 0000 03FF 0000 07FF" - $"0000 07FF 0000 07FE 0000 07FE 0000 0070" - } -}; - -resource 'ics#' (128) { - { -/* 1 */ $"FC30 8448 B4A7 8B7B 7083 007F 0003 1FF0" - $"1010 1010 2020 3FDF 0011 0011 0021 003E", -/* 2 */ $"FC30 FC78 FCFF FBFF 70FF 007F 0003 1FF0" - $"1FF0 1FF0 3FE0 3FDF 001F 001F 003F 003E" - } -}; - -resource 'ics4' (128) { - $"FFFF FF00 00FF 0000 FCCC CF00 0F02 F000" - $"FC38 CF00 F0F0 2FFF FDDD F0FF 2FFF F2FF" - $"0FFF 0000 F020 20FF 0000 0000 0FFF FFFF" - $"0000 0000 0000 00FF 000F FFFF FFFF 0000" - $"000F CCCC CCCF 0000 000F CCCC CCCF 0000" - $"00FD DDDD DDF0 0000 00FF FFFF FF0F FFFF" - $"0000 0000 000F CCCF 0000 0000 000F CCCF" - $"0000 0000 00FD DDDF 0000 0000 00FF FFF0" -}; - -resource 'ics8' (128) { - $"FFFF FFFF FFFF 0000 0000 FFFF 0000 0000" - $"FF2B 2B2B 2BFF 0000 00FF 0808 FF00 0000" - $"FF2B D8E3 2BFF 0000 FF08 FF08 08FF FFFF" - $"FFF9 F9F9 FF00 FFFF 08FF FFFF FF08 FFFF" - $"00FF FFFF 0000 0000 FF08 0808 0808 FFFF" - $"0000 0000 0000 0000 00FF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 FFFF" - $"0000 00FF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 00FF 2B2B 2B2B 2B2B 2BFF 0000 0000" - $"0000 00FF 2B2B 2B2B 2B2B 2BFF 0000 0000" - $"0000 FFF9 F9F9 F9F9 F9F9 FF00 0000 0000" - $"0000 FFFF FFFF FFFF FFFF 00FF FFFF FFFF" - $"0000 0000 0000 0000 0000 00FF 2B2B 2BFF" - $"0000 0000 0000 0000 0000 00FF 2B2B 2BFF" - $"0000 0000 0000 0000 0000 FFF9 F9F9 F9FF" - $"0000 0000 0000 0000 0000 FFFF FFFF FF" -}; - diff --git a/version.h b/version.h index c461831..8a3ac25 100644 --- a/version.h +++ b/version.h @@ -45,11 +45,11 @@ * version will be be represented by a larger number. */ -#define VERSION "0.4a2" -#define RELEASE_DATE "15 January 1997" +#define VERSION "1.0-rc1" +#define RELEASE_DATE "11 September 2013" -#define kVersionMajor 0x00 /* ie. N has two BCD digits */ -#define kVersionMinor 0x4 /* ie. M has a single BCD digit */ +#define kVersionMajor 0x01 /* ie. N has two BCD digits */ +#define kVersionMinor 0x0 /* ie. M has a single BCD digit */ #define kVersionBugFix 0x0 /* ie. X has a single BCD digit */ #define kVersionStage alpha /* ie. y is one of the set - */ /* {development,alpha,beta,final} -- 2.38.5