diff -Nru qpxtool-0.6.1/console/deadreader/deadreader.cpp qpxtool-0.6.1.1/console/deadreader/deadreader.cpp --- qpxtool-0.6.1/console/deadreader/deadreader.cpp 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/console/deadreader/deadreader.cpp 2007-10-22 22:50:00.000000000 +0400 @@ -2,7 +2,7 @@ * * DeadDiscReader * Copyright (C) 2006, Gennady "ShultZ" Kozlov - * it uses QPxTool SCSI transport lbrary + * it uses QPxTool SCSI transport library * */ diff -Nru qpxtool-0.6.1/console/pxcontrol/pxcontrol.cpp qpxtool-0.6.1.1/console/pxcontrol/pxcontrol.cpp --- qpxtool-0.6.1/console/pxcontrol/pxcontrol.cpp 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/console/pxcontrol/pxcontrol.cpp 2007-09-05 14:09:32.000000000 +0400 @@ -554,17 +554,18 @@ } else if(!strcmp(argv[i],"--as-create")) { flags |= FL_AS_CREATE; + ascre = 0; if (argc>(i+1)) { i++; - if (!strcmp(argv[i],"q")) ascre = ASDB_CRE_QUICK; - else if (!strcmp(argv[i],"f")) ascre = ASDB_CRE_FULL; + if (!strcmp(argv[i],"q")) ascre |= ASDB_CRE_QUICK; + else if (!strcmp(argv[i],"f")) ascre |= ASDB_CRE_FULL; else printf("invalid --as-create parameter 1: '%s'. Only 'q|f' are valid\n", argv[i]); } if (argc>(i+1)) { i++; - if (!strcmp(argv[i],"a")) ascre = ASDB_ADD; - else if (!strcmp(argv[i],"r")) ascre = ASDB_REPLACE; + if (!strcmp(argv[i],"a")) ascre |= ASDB_ADD; + else if (!strcmp(argv[i],"r")) ascre |= ASDB_REPLACE; else printf("invalid --as-create parameter 2: '%s'. Only 'a|r' are valid\n", argv[i]); } diff -Nru qpxtool-0.6.1/console/pxcontrol/version.h qpxtool-0.6.1.1/console/pxcontrol/version.h --- qpxtool-0.6.1/console/pxcontrol/version.h 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/console/pxcontrol/version.h 2007-09-05 14:14:40.000000000 +0400 @@ -9,4 +9,4 @@ * See the file "COPYING" for the exact licensing terms. */ -#define VERSION "1.1" +#define VERSION "1.2" diff -Nru qpxtool-0.6.1/lib/include/common_functions.h qpxtool-0.6.1.1/lib/include/common_functions.h --- qpxtool-0.6.1/lib/include/common_functions.h 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/lib/include/common_functions.h 2007-08-21 02:32:55.000000000 +0400 @@ -1,6 +1,6 @@ /* * This file is part of the QPxTool project. - * Copyright (C) 2005 Gennady "ShultZ" Kozlov + * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru qpxtool-0.6.1/lib/include/plextor_features.h qpxtool-0.6.1.1/lib/include/plextor_features.h --- qpxtool-0.6.1/lib/include/plextor_features.h 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/lib/include/plextor_features.h 2007-08-21 02:33:46.000000000 +0400 @@ -1,6 +1,6 @@ /* * This file is part of the QPxTool project. - * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov + * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru qpxtool-0.6.1/lib/include/qpx_mmc.h qpxtool-0.6.1.1/lib/include/qpx_mmc.h --- qpxtool-0.6.1/lib/include/qpx_mmc.h 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/lib/include/qpx_mmc.h 2007-08-21 02:33:05.000000000 +0400 @@ -1,6 +1,6 @@ /* * This file is part of the QPxTool project. - * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov + * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru qpxtool-0.6.1/lib/include/qpx_opcodes.h qpxtool-0.6.1.1/lib/include/qpx_opcodes.h --- qpxtool-0.6.1/lib/include/qpx_opcodes.h 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/lib/include/qpx_opcodes.h 2007-08-21 02:33:16.000000000 +0400 @@ -1,6 +1,6 @@ /* * This file is part of the QPxTool project. - * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov + * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru qpxtool-0.6.1/lib/qpxplextor/include/plextor_features.h qpxtool-0.6.1.1/lib/qpxplextor/include/plextor_features.h --- qpxtool-0.6.1/lib/qpxplextor/include/plextor_features.h 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/lib/qpxplextor/include/plextor_features.h 2007-08-21 02:33:46.000000000 +0400 @@ -1,6 +1,6 @@ /* * This file is part of the QPxTool project. - * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov + * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru qpxtool-0.6.1/lib/qpxplextor/plextor_features.cpp qpxtool-0.6.1.1/lib/qpxplextor/plextor_features.cpp --- qpxtool-0.6.1/lib/qpxplextor/plextor_features.cpp 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/lib/qpxplextor/plextor_features.cpp 2007-08-21 02:33:39.000000000 +0400 @@ -1,6 +1,6 @@ /* * This file is part of the QPxTool project. - * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov + * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru qpxtool-0.6.1/lib/qpxscan/plextor_qcheck.cpp qpxtool-0.6.1.1/lib/qpxscan/plextor_qcheck.cpp --- qpxtool-0.6.1/lib/qpxscan/plextor_qcheck.cpp 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/lib/qpxscan/plextor_qcheck.cpp 2007-09-20 15:04:35.000000000 +0400 @@ -1,6 +1,6 @@ /* * This file is part of the QPxTool project. - * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov + * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov * * * Some Plextor commands got from PxScan and CDVDlib (C) Alexander Noe` diff -Nru qpxtool-0.6.1/lib/qpxtransport/common_functions.cpp qpxtool-0.6.1.1/lib/qpxtransport/common_functions.cpp --- qpxtool-0.6.1/lib/qpxtransport/common_functions.cpp 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/lib/qpxtransport/common_functions.cpp 2007-08-21 02:32:45.000000000 +0400 @@ -1,6 +1,6 @@ /* * This file is part of the QPxTool project. - * Copyright (C) 2005 Gennady "ShultZ" Kozlov + * Copyright (C) 2005-2006, Gennady "ShultZ" Kozlov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru qpxtool-0.6.1/lib/qpxtransport/include/common_functions.h qpxtool-0.6.1.1/lib/qpxtransport/include/common_functions.h --- qpxtool-0.6.1/lib/qpxtransport/include/common_functions.h 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/lib/qpxtransport/include/common_functions.h 2007-08-21 02:32:55.000000000 +0400 @@ -1,6 +1,6 @@ /* * This file is part of the QPxTool project. - * Copyright (C) 2005 Gennady "ShultZ" Kozlov + * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru qpxtool-0.6.1/lib/qpxtransport/include/qpx_mmc.h qpxtool-0.6.1.1/lib/qpxtransport/include/qpx_mmc.h --- qpxtool-0.6.1/lib/qpxtransport/include/qpx_mmc.h 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/lib/qpxtransport/include/qpx_mmc.h 2007-08-21 02:33:05.000000000 +0400 @@ -1,6 +1,6 @@ /* * This file is part of the QPxTool project. - * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov + * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru qpxtool-0.6.1/lib/qpxtransport/include/qpx_opcodes.h qpxtool-0.6.1.1/lib/qpxtransport/include/qpx_opcodes.h --- qpxtool-0.6.1/lib/qpxtransport/include/qpx_opcodes.h 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/lib/qpxtransport/include/qpx_opcodes.h 2007-08-21 02:33:16.000000000 +0400 @@ -1,6 +1,6 @@ /* * This file is part of the QPxTool project. - * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov + * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru qpxtool-0.6.1/lib/qpxtransport/qpx_transport.cpp qpxtool-0.6.1.1/lib/qpxtransport/qpx_transport.cpp --- qpxtool-0.6.1/lib/qpxtransport/qpx_transport.cpp 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/lib/qpxtransport/qpx_transport.cpp 2007-10-22 22:55:36.000000000 +0400 @@ -142,12 +142,17 @@ #if defined(__linux) +#if !defined(INT_MAX) +#include +#endif + #include #include #include #include #include #include + #if !defined(SG_FLAG_LUN_INHIBIT) # if defined(SG_FLAG_UNUSED_LUN_INHIBIT) # define SG_FLAG_LUN_INHIBIT SG_FLAG_UNUSED_LUN_INHIBIT diff -Nru qpxtool-0.6.1/qpxtool-gui/Makefile.qmake qpxtool-0.6.1.1/qpxtool-gui/Makefile.qmake --- qpxtool-0.6.1/qpxtool-gui/Makefile.qmake 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/qpxtool-gui/Makefile.qmake 2007-10-22 22:52:20.000000000 +0400 @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: qpxtool -# Generated by qmake (1.07a) (Qt 3.3.8) on: Sun Aug 19 18:04:15 2007 +# Generated by qmake (1.07a) (Qt 3.3.8) on: Mon Oct 22 22:52:20 2007 # Project: qpxtool.pro # Template: app # Command: $(QMAKE) -o Makefile.qmake qpxtool.pro @@ -16,7 +16,7 @@ CXXFLAGS = -pipe -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED LEXFLAGS = YACCFLAGS= -d -INCPATH = -I/usr/lib/qt/mkspecs/default -I. -I../lib/include -I. -Iinclude -I$(QTDIR)/include +INCPATH = -I/usr/lib/qt/mkspecs/default -I. -I../lib/include -I. -Iinclude -Iui -I$(QTDIR)/include LINK = g++ LFLAGS = -Wl,-rpath,../lib/lib -Wl,-rpath,$(QTDIR)/lib LIBS = $(SUBLIBS) -L../lib/lib -L$(QTDIR)/lib -L/usr/X11R6/lib -lqpxtransport -lqpxplextor -lqpxpioneer -lqpxscan -lqt-mt -lXext -lX11 -lm -lpthread diff -Nru qpxtool-0.6.1/qpxtool-gui/QPxTool.cpp qpxtool-0.6.1.1/qpxtool-gui/QPxTool.cpp --- qpxtool-0.6.1/qpxtool-gui/QPxTool.cpp 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/qpxtool-gui/QPxTool.cpp 2007-09-10 20:16:17.000000000 +0400 @@ -1,6 +1,6 @@ /* * This file is part of the QPxTool project. - * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov + * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru qpxtool-0.6.1/qpxtool-gui/main.cpp qpxtool-0.6.1.1/qpxtool-gui/main.cpp --- qpxtool-0.6.1/qpxtool-gui/main.cpp 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/qpxtool-gui/main.cpp 2007-08-19 18:46:36.000000000 +0400 @@ -31,7 +31,7 @@ { // const char *program_name = argv[0]; printf("\n________________________________________"); - printf("\n QPxTool-%s\n (c) 2005-2006, Gennady \"ShultZ\" Kozlov",VERSION); + printf("\n QPxTool-%s\n (c) 2005-2007, Gennady \"ShultZ\" Kozlov",VERSION); printf("\n________________________________________"); printf("\ncurrent system:"); uname(&sys); diff -Nru qpxtool-0.6.1/qpxtool-gui/qcheck/test_threads.cpp qpxtool-0.6.1.1/qpxtool-gui/qcheck/test_threads.cpp --- qpxtool-0.6.1/qpxtool-gui/qcheck/test_threads.cpp 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/qpxtool-gui/qcheck/test_threads.cpp 2007-08-21 02:35:43.000000000 +0400 @@ -1,6 +1,6 @@ /* * This file is part of the QPxTool project. - * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov + * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru qpxtool-0.6.1/qpxtool-gui/version.h qpxtool-0.6.1.1/qpxtool-gui/version.h --- qpxtool-0.6.1/qpxtool-gui/version.h 2007-08-19 18:04:14.000000000 +0400 +++ qpxtool-0.6.1.1/qpxtool-gui/version.h 2007-08-21 02:35:24.000000000 +0400 @@ -1,6 +1,6 @@ /* * This file is part of the QPxTool project. - * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov + * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by