Changeset 176 for trunk

Timestamp:

Mar 12, 2016, 12:25:36 AM (9 years ago)

Author:

David Azarewicz

Message:

Documentation and makefile changes for Arca Noae packaging.
No code changes.

Location:

trunk

Files:

• src/os2ahci/Makefile (modified) (6 diffs)
• src/os2ahci/README (modified) (6 diffs)
• src/os2ahci/_build.cmd (modified) (1 diff)
• src/os2ahci/ahci.c (modified) (1 diff)
• src/os2ahci/apm.c (modified) (1 diff)
• src/os2ahci/ata.c (modified) (1 diff)
• src/os2ahci/libc.c (modified) (1 diff)
• src/os2ahci/os2ahci.c (modified) (3 diffs)
• src/os2ahci/os2ahci.h (modified) (1 diff)
• src/os2ahci/pci.c (modified) (1 diff)
• src/os2ahci/trace.c (modified) (1 diff)
• tools/AddToFile.cmd (modified) (2 diffs)

trunk/src/os2ahci/Makefile

@@ -4 +4 @@
 #
 # Copyright (c) 2010 Christian Mueller, Markus Thielen.
-# Copyright (c) 2013 David Azarewicz
+# Copyright (c) 2013-2015 David Azarewicz
 # Parts copied from/inspired by the Linux AHCI driver;
 # those parts are (c) Linux AHCI/ATA maintainers
@@ -34 +34 @@
 FIXPACK=
 
+!ifndef %ROOT
+ROOT=$+$(%cwd)$-
+!else
+ROOT=$(%ROOT)
+!endif
+
 !ifndef %WATCOM # if not defined in the environment
 !error WATCOM must be set in the environment.
@@ -58 +64 @@
 !endif
 
+VERSION=$(BLD_MAJOR).$(BLD_MINOR)
+ZIPDIR=$(ROOT)\tmp
+
+!if "$(FIXPACK)"!=""
+!ifndef %BLD_DATE
+!error BLD_DATE must be defined for test versions
+!endif
+WPIFILE=$(ROOT)\AHCI-test-$(VERSION)-$(%BLD_DATE)-WPI.zip
+!else
+WPIFILE=$(ROOT)\AHCI-$(VERSION)-WPI.zip
+!endif
+
 AS_INCLUDE = -I=$(DDK)\base\inc
 LIB_DIRS = $(DDK)\base\lib\
@@ -70 +88 @@
 
 %INCLUDE=..\include;$(DDK)\base\h;
-%PATH=..\..\tools;$(WATCOM)\BINP;$(WATCOM)\BINW;$(DDK)\base\tools;
+%PATH=$(ROOT)\tools;$(WATCOM)\BINP;$(WATCOM)\BINW;$(DDK)\base\tools;$(%PATH)
 AS=wasm
 CC=wcc
@@ -139 +157 @@
     @%create $^@
     @%append $^@ /* Autogenerated by Makefile */
-    @%append $^@ $#define VERSION $(BLD_MAJOR)$(BLD_MINOR) /* driver version (2 implied decimals) */
+    @%append $^@ $#define DMAJOR $(BLD_MAJOR)
+    @%append $^@ $#define DMINOR $(BLD_MINOR)
     @%append $^@ $#define DVENDOR "$(VENDOR)"
     @AddToFile $^@,$#define BLD_YEAR,DATEYEAR
     @AddToFile $^@,$#define BLD_MONTH,DATEMONTH
     @AddToFile $^@,$#define BLD_DAY,DATEDAY
-    @AddToFile $^@,$#define BLDLEVEL,BLDLEVEL2,$(VENDOR),$(BLD_MAJOR).$(BLD_MINOR),AHCI Driver (c) 2013 $(VENDOR),$(FIXPACK)
+    @AddToFile $^@,$#define BLDLEVEL,BLDLEVEL2,$(VENDOR),$(VERSION),AHCI Driver (c) 2015 $(VENDOR),$(FIXPACK)
 
 .asm.obj: .autodepend
@@ -187 +206 @@
     @%erase $^*.ma1
 
+release: os2ahci.add os2ahci.sym .symbolic
+  @if exist $(WPIFILE) @del $(WPIFILE)
+  @!rm -rf $(ZIPDIR)
+
+  @md $(ZIPDIR)
+
+  @md $(ZIPDIR)\pkg1
+  @copy /b $(ROOT)\src\os2ahci\os2ahci.add $(ZIPDIR)\pkg1 >NUL
+  @copy /b $(ROOT)\src\os2ahci\os2ahci.sym $(ZIPDIR)\pkg1 >NUL
+
+  @md $(ZIPDIR)\pkg2
+  @copy /b $(ROOT)\Tools\smartahci.exe $(ZIPDIR)\pkg2 >NUL
+  #@copy $(ROOT)\Tools\testlog.cmd $(ZIPDIR)\pkg2 >NUL
+
+  @md $(ZIPDIR)\pkg20
+  @copy $(ROOT)\src\os2ahci\README $(ZIPDIR)\pkg20 >NUL
+  @copy $(ROOT)\Tools\LICENSE $(ZIPDIR)\pkg20 >NUL
+
+  @md $(ZIPDIR)\wpi
+  @sed -e "s/\\X\\X\\X/\\0\\$(VERSION:.=\\)/" $(ROOT)\Tools\ahci.wis >$(ZIPDIR)\wpi\ahci.wis
+  #@copy $(ROOT)\tools\stub.exe $(ZIPDIR)\wpi >NUL
+
+  cd $(ZIPDIR)
+  @zip -r -X $(WPIFILE) *
+  @cd $(ROOT)
+  @!rm -rf $(ZIPDIR)
+

trunk/src/os2ahci/README

@@ -1 @@
-====================================================================
-                      eComStation AHCI Driver
-====================================================================
+AHCI Driver for OS/2 v1.32
 
 
@@ -7 +5 @@
 ============
 
-OS2AHCI is an AHCI driver for eComStation. It supports both ATA and
+OS2AHCI is an AHCI driver for OS/2. It supports both ATA and
 ATAPI devices in a single driver. An ATAPI/CDROM filter driver is
 only required if you want to read/write CD-DA (audio) format CDs.
 
 
-Copyrights
-==========
-
+Copyrights and License
+======================
+
+(c) Copyright IBM Corporation 1990,2000.
+All rights reserved.
 Copyright (c) 2011 thi.guten Software Development
-Copyright (c) 2011-2013 Mensys B.V.
-Copyright (c) 2013 David Azarewicz
+Copyright (c) 2011 Mensys B.V.
+Copyright (c) 2013-2015 David Azarewicz
 
 Authors: Christian Mueller, Markus Thielen
 
 Parts copied from/inspired by the Linux AHCI driver;
-those parts are (c) Linux AHCI/ATA maintainers
+those parts are (c) Linux AHCI/ATA maintainers.
 
  This program is free software; you can redistribute it and/or modify
@@ -39 +39 @@
  MA  02111-1307  USA
 
-
-Licensing and Source Code
-=========================
-
-The *binary* delivery of OS2AHCI.ADD as obtained from the BetaZone,
-or as part of packaged eComStation releases, is licensed to run with
-eComStation only.
-
-The source code can be retrieved from http://svn.ecomstation.nl;
-in compliance to the GNU General Public License, the source code
+The OS2AHCI.ADD Driver Software is a derivative work of the IBM DDK.
+Binary programs and documentation for the OS2AHCI.ADD Driver
+Software are licensed to and distributed by Arca Noae, LLC.
+
+The source code can be retrieved from http://svn.netlabs.org.
+In compliance to the GNU General Public License, the source code
 can of course be modified/compiled to run on other products as long
-as modifications will also be published as outlined in the GNU GPL2.
-
-Please note that builds other than the official binary delivered as
-part of eComStation releases or downloaded from the BetaZone are
-not officially supported.
-
-
-Building The Driver
--------------------
-
-The toolchain required for compilation consists of:
-
- - The MiniDDK or an updated DDK
- - Open Watcom version 1.9 or later
-
-Define DDK and WATCOM in the environment.
-Use "wmake" or "wmake -a" to build the driver. See _build.cmd.
-
-Installation
-============
-
-- Run the included update.cmd,
-  or copy the driver file, OS2AHCI.ADD, to \OS2\BOOT on your boot disk.
-
-- Add the following line to CONFIG.SYS:
-  BASEDEV=OS2AHCI.ADD
-
-
-Reporting Problems
-==================
-
-If you have problems with this driver, please read the Troubleshooting
-page at:
-
-  http://svn.ecomstation.nl/ahci/wiki/Troubleshooting
-
-You can open a ticket at:
-  http://svn.ecomstation.nl/ahci
+as modifications will also be published as outlined in the GNU GPL.
+
+Please note that builds other than the official binary delivered by
+the Arca Noae web site are not officially supported.
+
+
+Getting Support and Reporting Problems
+======================================
+
+For more information and to report problems please visit:
+  https://www.arcanoae.com
+and click on SUPPORT.
+
+Or go directly to the AHCI support wiki at:
+  https://www.arcanoae.com/wiki/ahci/
 
 
@@ -209 +182 @@
 While we believe NCQ will work with the majority of controllers and hard
 disks, it's currently turned off by default until we have more feedback
-from eComStation users. In order to turn on NCQ, just add the command line
+from OS/2 users. In order to turn on NCQ, just add the command line
 option "/n" to OS2AHCI.ADD.
 
@@ -385 +358 @@
 
 
+Manual Installation
+===================
+
+- Run the included update.cmd,
+  or copy the driver file, OS2AHCI.ADD, to \OS2\BOOT on your boot disk.
+
+- Add the following line to CONFIG.SYS:
+  BASEDEV=OS2AHCI.ADD
+
+
+Building The Driver
+-------------------
+
+The toolchain required for compilation consists of:
+
+ - The MiniDDK or an updated DDK (You must have a DDK license
+   to build this driver.)
+ - Open Watcom version 1.9 or later
+
+Define DDK and WATCOM in the environment.
+Use "wmake" or "wmake -a" to build the driver. See _build.cmd.
+
+
 Change Log
 ==========
@@ -413 +409 @@
   Reworked suspend/resume routines.
   Implemented a temporary hack to make resume work reasonably well.
-  Suspend/resume is only supported on eCS systems with ACPI.
+  Suspend/resume is only supported on OS/2 systems with ACPI.
   Suspend/resume is known to not work reliably and cannot be further
     addressed in this driver.

trunk/src/os2ahci/_build.cmd

@@ -1 +1 @@
 @echo off
-rem set VENDOR=Mensys BV
+rem set VENDOR=Your Name
 rem set BLD_MAJOR=1
 rem set BLD_MINOR=27
-rem set WATCOM=i:\Watcom
-rem set DDK=i:\ddk
+rem set WATCOM=e:\Watcom
+rem set DDK=f:\ddk
 wmake -a

trunk/src/os2ahci/ahci.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Copyright (c) 2013 David Azarewicz
+ * Copyright (c) 2013-2015 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen

trunk/src/os2ahci/apm.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Portions copyright (c) 2013 David Azarewicz
+ * Portions copyright (c) 2013-2015 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen

trunk/src/os2ahci/ata.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Portions copyright (c) 2013 David Azarewicz
+ * Portions copyright (c) 2013-2015 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen

trunk/src/os2ahci/libc.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Portions copyright (c) 2013 David Azarewicz
+ * Portions copyright (c) 2013-2015 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen

trunk/src/os2ahci/os2ahci.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Copyright (c) 2013 David Azarewicz
+ * Copyright (c) 2013-2015 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -120 +120 @@
   "AHCI SATA Driver",              /* driver description */
   DVENDOR,                         /* vendor name */
-  CMVERSION_MAJOR,                 /* RM interface version major */
-  CMVERSION_MINOR,                 /* RM interface version minor */
+  DMAJOR,                          /* RM interface version major */
+  DMINOR,                          /* RM interface version minor */
   BLD_YEAR, BLD_MONTH, BLD_DAY,    /* date */
   0,                               /* driver flags */
@@ -426 +426 @@
 
   /* print initialization message */
-  ciprintf(init_msg, drv_name, VERSION / 100, VERSION % 100);
+  ciprintf(init_msg, drv_name, DMAJOR, DMINOR);
 
   #ifdef TESTVER

trunk/src/os2ahci/os2ahci.h

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Copyright (c) 2013 David Azarewicz
+ * Copyright (c) 2013-2015 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen

trunk/src/os2ahci/pci.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Copyright (c) 2013 David Azarewicz
+ * Copyright (c) 2013-2015 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen

trunk/src/os2ahci/trace.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Copyright (c) 2013 David Azarewicz
+ * Copyright (c) 2013-2015 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen

trunk/tools/AddToFile.cmd

@@ -4 +4 @@
  *  AddToFile.cmd FileName,PrefixString,Function[,Parameters...]
  *
+ * Examples:
  *  AddToFile.cmd FileName,#define DDATE,DATEL
  *    Adds today's date to Filename: #define DDATE 20130312L
@@ -60 +61 @@
   end
 
-  when (What="VERSION") then do
-    Version = '12.345';
-    say 'Setting '||String||' to '||Version;
-    rc=lineout(OutFile, String||'='||Version);
+  when (What="VERSIONMAJOR") then do
+    parse var ProjVendor Major'.'Minor'.'Revision;
+    rc=lineout(OutFile, String||' '||FORMAT(Major));
+    rc=lineout(OutFile);
+  end
+
+  when (What="VERSIONMINOR") then do
+    parse var ProjVendor Major'.'Minor'.'Revision;
+    rc=lineout(OutFile, String||' '||FORMAT(Minor));
+    rc=lineout(OutFile);
+  end
+
+  when (What="VERSIONREVISION") then do
+    parse var ProjVendor Major'.'Minor'.'Revision;
+    rc=lineout(OutFile, String||' '||FORMAT(Revision));
     rc=lineout(OutFile);
   end