* Dotted filenames for package cdrom

packages/cdrom/namespaced/System.CdRom.Cddb.pp

@@ -0,0 +1,3 @@
+unit System.CdRom.Cddb;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpcddb.pp}

packages/cdrom/namespaced/System.CdRom.DiscId.pp

@@ -0,0 +1,3 @@
+unit System.CdRom.DiscId;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i discid.pp}

packages/cdrom/namespaced/System.CdRom.Linux.pp

@@ -0,0 +1,3 @@
+unit System.CdRom.Linux;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i lincd.pp}

packages/cdrom/namespaced/System.CdRom.Major.pp

@@ -0,0 +1,3 @@
+unit System.CdRom.Major;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i major.pp}

packages/cdrom/namespaced/System.CdRom.ScsiDefs.pp

@@ -0,0 +1,3 @@
+unit System.CdRom.ScsiDefs;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i scsidefs.pp}

packages/cdrom/namespaced/System.CdRom.Windows.Aspi32.pp

@@ -0,0 +1,3 @@
+unit System.CdRom.Windows.Aspi32;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i wnaspi32.pp}

packages/cdrom/namespaced/System.CdRom.Windows.IoCtl.pp

@@ -0,0 +1,3 @@
+unit System.CdRom.Windows.IoCtl;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cdromioctl.pp}

packages/cdrom/namespaced/System.CdRom.Windows.pp

@@ -0,0 +1,3 @@
+unit System.CdRom.Windows;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i wincd.pp}

packages/cdrom/namespaced/System.CdRom.pp

@@ -0,0 +1,3 @@
+unit System.CdRom;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cdrom.pp}

packages/cdrom/namespaces.lst

@@ -0,0 +1,11 @@
+src/fpcddb.pp=namespaced/System.CdRom.Cddb.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/wincd.pp=namespaced/System.CdRom.Windows.pp
+src/cdrom.pp=namespaced/System.CdRom.pp
+src/scsidefs.pp=namespaced/System.CdRom.ScsiDefs.pp
+src/major.pp=namespaced/System.CdRom.Major.pp
+src/lincd.pp=namespaced/System.CdRom.Linux.pp
+src/cdromioctl.pp=namespaced/System.CdRom.Windows.IoCtl.pp
+src/wnaspi32.pp=namespaced/System.CdRom.Windows.Aspi32.pp
+src/discid.pp=namespaced/System.CdRom.DiscId.pp

packages/cdrom/src/cdrom.pp

@@ -11,7 +11,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit cdrom;
+{$ENDIF}
 
 {$mode objfpc}
 {$h+}

packages/cdrom/src/cdromioctl.pp

@@ -1,8 +1,14 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit cdromioctl;
+{$ENDIF FPC_DOTTEDUNITS}
 {$mode objfpc}
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {
   Automatically converted by H2Pas 0.99.15 from cdromioctl.h

packages/cdrom/src/cdromlin.inc

@@ -1,7 +1,14 @@
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  UnixApi.Base,
+  UnixApi.Unix,
+  System.CdRom.Linux;
+{$ELSE}
 uses
   baseunix,
   unix,
   lincd;
+{$ENDIF}
 
 Function ReadCDTOC(Device : AnsiString; Var CDTOC : Array of TTocEntry) : Integer;
 

packages/cdrom/src/cdromw32.inc

@@ -1,5 +1,8 @@
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.CdRom.Windows;
+{$ELSE}
 uses wincd;
-
+{$ENDIF}
 
 Function ReadCDTOC(Device : AnsiString; Var CDTOC : Array of TTocEntry) : Integer;
 

packages/cdrom/src/discid.pp

@@ -12,13 +12,19 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit discid;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.CdRom,System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses cdrom,sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Function CDDBDiscID(Const CDTOC : Array of TTocEntry; Count : Integer) : integer ;
 Function GetCDDBQueryString(Const Tracks : Array of TTocEntry; Count : Integer) : AnsiString;

packages/cdrom/src/fpcddb.pp

@@ -24,14 +24,21 @@
 
 
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpcddb;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils; 
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils; 
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TCDDisk = Class;

packages/cdrom/src/lincd.pp

@@ -11,15 +11,23 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit lincd;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  UnixApi.Base,
+  UnixApi.Unix;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   baseunix,
   unix;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { ---------------------------------------------------------------------
     cdrom.h header translation.
@@ -721,7 +729,11 @@ Function DetectCd : AnsiString;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.CDROM.Major,System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses major,sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { ---------------------------------------------------------------------
     Functions from cdrom.h translation.

packages/cdrom/src/major.pp

@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit major;
+{$ENDIF FPC_DOTTEDUNITS}
 interface
 
 {

packages/cdrom/src/scsidefs.pp

@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit scsidefs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 

packages/cdrom/src/wincd.pp

@@ -1,13 +1,19 @@
 {
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit WinCD;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 {$h+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows,System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows,SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TCDAccessMethod = (camNone,camASPI,camSPTI,camIOCTL);
@@ -39,7 +45,11 @@ Function  GetNumDrives : Integer;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.CdRom.Windows.IoCtl, System.CdRom.Windows.Aspi32, System.CdRom.ScsiDefs;
+{$ELSE FPC_DOTTEDUNITS}
 uses cdromioctl,wnaspi32,scsidefs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Var
   CurrentAccessMethod : TCDAccessMethod;

packages/cdrom/src/wnaspi32.pp

@@ -1,10 +1,16 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit wnaspi32;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   LPSRB = Pointer;
@@ -218,7 +224,11 @@ procedure UnloadASPI;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.DynLibs;
+{$ELSE FPC_DOTTEDUNITS}
 uses dynlibs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   HWNASPI : TLibHandle = 0;