paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-07 10:19:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Added fpcddb.pp to Makefile. Small fix in unix CD detection

Browse Source 
git-svn-id: trunk@13009 -
This commit is contained in:
michael 2009-04-13 17:56:21 +00:00
parent 606dbcec8c
commit 0d30dfad3a
3 changed files with 78 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
packages/cdrom/Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/12/12] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/11/14]
# #
default: all default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@ -265,178 +265,178 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F
override PACKAGE_NAME=cdrom override PACKAGE_NAME=cdrom
override PACKAGE_VERSION=2.2.2 override PACKAGE_VERSION=2.2.2
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-go32v2) ifeq ($(FULL_TARGET),i386-go32v2)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-win32) ifeq ($(FULL_TARGET),i386-win32)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-os2) ifeq ($(FULL_TARGET),i386-os2)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-freebsd) ifeq ($(FULL_TARGET),i386-freebsd)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-haiku) ifeq ($(FULL_TARGET),i386-haiku)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-solaris) ifeq ($(FULL_TARGET),i386-solaris)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-qnx) ifeq ($(FULL_TARGET),i386-qnx)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-netware) ifeq ($(FULL_TARGET),i386-netware)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-openbsd) ifeq ($(FULL_TARGET),i386-openbsd)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-wdosx) ifeq ($(FULL_TARGET),i386-wdosx)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-darwin) ifeq ($(FULL_TARGET),i386-darwin)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-emx) ifeq ($(FULL_TARGET),i386-emx)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-watcom) ifeq ($(FULL_TARGET),i386-watcom)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-netwlibc) ifeq ($(FULL_TARGET),i386-netwlibc)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-wince) ifeq ($(FULL_TARGET),i386-wince)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-embedded) ifeq ($(FULL_TARGET),i386-embedded)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-symbian) ifeq ($(FULL_TARGET),i386-symbian)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),m68k-freebsd) ifeq ($(FULL_TARGET),m68k-freebsd)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),m68k-netbsd) ifeq ($(FULL_TARGET),m68k-netbsd)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),m68k-amiga) ifeq ($(FULL_TARGET),m68k-amiga)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),m68k-atari) ifeq ($(FULL_TARGET),m68k-atari)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),m68k-openbsd) ifeq ($(FULL_TARGET),m68k-openbsd)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),m68k-palmos) ifeq ($(FULL_TARGET),m68k-palmos)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),m68k-embedded) ifeq ($(FULL_TARGET),m68k-embedded)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),powerpc-linux) ifeq ($(FULL_TARGET),powerpc-linux)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),powerpc-netbsd) ifeq ($(FULL_TARGET),powerpc-netbsd)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),powerpc-amiga) ifeq ($(FULL_TARGET),powerpc-amiga)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),powerpc-macos) ifeq ($(FULL_TARGET),powerpc-macos)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),powerpc-darwin) ifeq ($(FULL_TARGET),powerpc-darwin)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),powerpc-morphos) ifeq ($(FULL_TARGET),powerpc-morphos)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),powerpc-embedded) ifeq ($(FULL_TARGET),powerpc-embedded)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),sparc-linux) ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),sparc-netbsd) ifeq ($(FULL_TARGET),sparc-netbsd)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),sparc-solaris) ifeq ($(FULL_TARGET),sparc-solaris)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),sparc-embedded) ifeq ($(FULL_TARGET),sparc-embedded)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),x86_64-linux) ifeq ($(FULL_TARGET),x86_64-linux)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),x86_64-darwin) ifeq ($(FULL_TARGET),x86_64-darwin)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),x86_64-win64) ifeq ($(FULL_TARGET),x86_64-win64)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),x86_64-embedded) ifeq ($(FULL_TARGET),x86_64-embedded)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),arm-linux) ifeq ($(FULL_TARGET),arm-linux)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),arm-palmos) ifeq ($(FULL_TARGET),arm-palmos)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),arm-darwin) ifeq ($(FULL_TARGET),arm-darwin)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),arm-gba) ifeq ($(FULL_TARGET),arm-gba)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),arm-nds) ifeq ($(FULL_TARGET),arm-nds)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),arm-embedded) ifeq ($(FULL_TARGET),arm-embedded)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),arm-symbian) ifeq ($(FULL_TARGET),arm-symbian)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),powerpc64-darwin) ifeq ($(FULL_TARGET),powerpc64-darwin)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),avr-embedded) ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),armeb-linux) ifeq ($(FULL_TARGET),armeb-linux)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),armeb-embedded) ifeq ($(FULL_TARGET),armeb-embedded)
override TARGET_UNITS+=cdrom discid override TARGET_UNITS+=cdrom discid fpcddb
endif endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override TARGET_IMPLICITUNITS+=major lincd override TARGET_IMPLICITUNITS+=major lincd

2
packages/cdrom/Makefile.fpc
View File

@ -7,7 +7,7 @@ name=cdrom
version=2.2.2 version=2.2.2
[target] [target]
units=cdrom discid units=cdrom discid fpcddb
implicitunits_win32=scsidefs wnaspi32 cdromioctl wincd implicitunits_win32=scsidefs wnaspi32 cdromioctl wincd
implicitunits_linux=major lincd implicitunits_linux=major lincd
exampledirs=examples exampledirs=examples

5
packages/cdrom/src/lincd.pp
View File

@ -1163,9 +1163,13 @@ begin
If fpStat(Device,info)<>0 then If fpStat(Device,info)<>0 then
exit; exit;
DeviceMajor:=info.st_rdev shr 8; DeviceMajor:=info.st_rdev shr 8;
Writeln('Device major : ',DeviceMajor);
If DeviceMajor in [IDE0_MAJOR,IDE1_MAJOR,IDE2_MAJOR,IDE3_MAJOR] then If DeviceMajor in [IDE0_MAJOR,IDE1_MAJOR,IDE2_MAJOR,IDE3_MAJOR] then
Result:=TestCDRomIOCTL(Device) Result:=TestCDRomIOCTL(Device)
else else
begin
Result:= DeviceMajor=SCSI_CDROM_MAJOR;
If not Result then
begin begin
Result:=DeviceMajor in CDMajor; Result:=DeviceMajor in CDMajor;
If Not Result then If Not Result then
@ -1181,6 +1185,7 @@ begin
end; end;
end; end;
end; end;
end;
Function TestCDRomIOCTL(Device : String) : Boolean; Function TestCDRomIOCTL(Device : String) : Boolean;