tools: print a warning for tools replaced by intel_reg
PATCH 1/1 tools: print a warning for tools replaced by intel_reg
--- tools/intel_iosf_sb_read.c | 3 +++ tools/intel_iosf_sb_write.c | 3 +++ tools/intel_reg_dumper.c | 3 +++ tools/intel_reg_read.c | 3 +++ tools/intel_reg_snapshot.c | 4 ++++ tools/intel_reg_write.c | 3 +++ tools/intel_vga_read.c | 3 +++ tools/intel_vga_write.c | 3 +++ 8 files changed, 25 insertions(+)
tools/intel_iosf_sb_read.c +3 -0
@@ -94,6 +94,9 @@ int main(int argc, char *argv[])int i, nregs, count =1 , reg_stride;const char *name; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +if (!IS_VALLEYVIEW (dev->device_id) && !IS_CHERRYVIEW (dev->device_id)) {usage (argv[0 ]);
tools/intel_iosf_sb_write.c +3 -0
@@ -89,6 +89,9 @@ int main(int argc, char** argv)int i, nregs;const char *name; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +if (!IS_VALLEYVIEW (dev->device_id) && !IS_CHERRYVIEW (dev->device_id)) {usage (argv[0 ]);
tools/intel_reg_dumper.c +3 -0
@@ -2931,6 +2931,9 @@ int main(int argc, char** argv)char *file =NULL , *reg_name =NULL ;uint32_t reg_val, power_well; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +while ((opt =getopt (argc, argv,"d:h" )) !=-1 ) {switch (opt) {case 'd' :
tools/intel_reg_read.c +3 -0
@@ -74,6 +74,9 @@ int main(int argc, char** argv)int decode_bits =0 ;int dwords =1 ; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +while ((ch =getopt (argc, argv,"dfhc:" )) !=-1 ) {switch (ch) {case 'd' :
tools/intel_reg_snapshot.c +4 -0
@@ -26,6 +26,7 @@#include <unistd.h> #include <assert.h> +#include <stdio.h> #include "intel_io.h" #include "intel_chipset.h"
@@ -36,6 +37,9 @@ int main(int argc, char** argv)int mmio_bar;int ret; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); + pci_dev =intel_get_pci_device (); devid = pci_dev->device_id;intel_mmio_use_pci_bar (pci_dev);
tools/intel_reg_write.c +3 -0
@@ -36,6 +36,9 @@ int main(int argc, char** argv) {uint32_t reg, value; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +if (argc <3 ) {printf ("Usage: %s addr value\n" , argv[0 ]);printf (" WARNING: This is dangerous to you and your system's health.\n" );
tools/intel_vga_read.c +3 -0
@@ -57,6 +57,9 @@ int main(int argc, char *argv[])int i, ch;const char *cmdname = argv[0 ]; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +while ((ch =getopt (argc, argv,"m" )) !=-1 ) {switch (ch) {case 'm' :
tools/intel_vga_write.c +3 -0
@@ -57,6 +57,9 @@ int main(int argc, char *argv[])int ch;const char *cmdname = argv[0 ]; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +while ((ch =getopt (argc, argv,"m" )) !=-1 ) {switch (ch) {case 'm' :
Signature · 6 lines
2.4.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 2 lines · Thomas Wood
Cc Jani Nikula <[email protected]>Signed-off-by Thomas Wood <[email protected]>
I'd go even one step further and do an exec using the corresponding intel_reg commandline. On top of this patch ofc. Then we could nuke a lot of the existing boilerplate already and then perhaps nuke all the tools one release later on or so.
-Daniel
Quoted 138 lines
--- tools/intel_iosf_sb_read.c | 3 +++ tools/intel_iosf_sb_write.c | 3 +++ tools/intel_reg_dumper.c | 3 +++ tools/intel_reg_read.c | 3 +++ tools/intel_reg_snapshot.c | 4 ++++ tools/intel_reg_write.c | 3 +++ tools/intel_vga_read.c | 3 +++ tools/intel_vga_write.c | 3 +++ 8 files changed, 25 insertions(+)tools/intel_iosf_sb_read.c +3
-0@@ -94,6 +94,9 @@ int main(int argc, char *argv[])int i, nregs, count =1 , reg_stride;const char *name; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +if (!IS_VALLEYVIEW (dev->device_id) && !IS_CHERRYVIEW (dev->device_id)) {usage (argv[0 ]);tools/intel_iosf_sb_write.c +3
-0@@ -89,6 +89,9 @@ int main(int argc, char** argv)int i, nregs;const char *name; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +if (!IS_VALLEYVIEW (dev->device_id) && !IS_CHERRYVIEW (dev->device_id)) {usage (argv[0 ]);tools/intel_reg_dumper.c +3
-0@@ -2931,6 +2931,9 @@ int main(int argc, char** argv)char *file =NULL , *reg_name =NULL ;uint32_t reg_val, power_well; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +while ((opt =getopt (argc, argv,"d:h" )) !=-1 ) {switch (opt) {case 'd' :tools/intel_reg_read.c +3
-0@@ -74,6 +74,9 @@ int main(int argc, char** argv)int decode_bits =0 ;int dwords =1 ; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +while ((ch =getopt (argc, argv,"dfhc:" )) !=-1 ) {switch (ch) {case 'd' :tools/intel_reg_snapshot.c +4
-0@@ -26,6 +26,7 @@#include <unistd.h> #include <assert.h> +#include <stdio.h> #include "intel_io.h" #include "intel_chipset.h" @@ -36,6 +37,9 @@ int main(int argc, char** argv)int mmio_bar;int ret; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); + pci_dev =intel_get_pci_device (); devid = pci_dev->device_id;intel_mmio_use_pci_bar (pci_dev);tools/intel_reg_write.c +3
-0@@ -36,6 +36,9 @@ int main(int argc, char** argv) {uint32_t reg, value; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +if (argc <3 ) {printf ("Usage: %s addr value\n" , argv[0 ]);printf (" WARNING: This is dangerous to you and your system's health.\n" );tools/intel_vga_read.c +3
-0@@ -57,6 +57,9 @@ int main(int argc, char *argv[])int i, ch;const char *cmdname = argv[0 ]; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +while ((ch =getopt (argc, argv,"m" )) !=-1 ) {switch (ch) {case 'm' :tools/intel_vga_write.c +3
-0@@ -57,6 +57,9 @@ int main(int argc, char *argv[])int ch;const char *cmdname = argv[0 ]; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +while ((ch =getopt (argc, argv,"m" )) !=-1 ) {switch (ch) {case 'm' :Signature · 6 lines
2.4.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Daniel Vetter
Quoted 2 lines · Thomas Wood
Cc Jani Nikula <[email protected]>Signed-off-by Thomas Wood <[email protected]>I'd go even one step further and do an exec using the corresponding
intel_regcommandline. On top of this patch ofc.
IMO more work than it's worth.
Quoted 2 lines
Then we could nuke a lot of the existing boilerplate already and then perhaps nuke all the tools one release later on or so.
Hmm didn't we already make a release with the warnings? I'd just nuke the deprecated ones from git now.
BR,
Jani.
Quoted 145 lines
-Daniel
Quoted 138 lines
--- tools/intel_iosf_sb_read.c | 3 +++ tools/intel_iosf_sb_write.c | 3 +++ tools/intel_reg_dumper.c | 3 +++ tools/intel_reg_read.c | 3 +++ tools/intel_reg_snapshot.c | 4 ++++ tools/intel_reg_write.c | 3 +++ tools/intel_vga_read.c | 3 +++ tools/intel_vga_write.c | 3 +++ 8 files changed, 25 insertions(+)tools/intel_iosf_sb_read.c +3
-0@@ -94,6 +94,9 @@ int main(int argc, char *argv[])int i, nregs, count =1 , reg_stride;const char *name; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +if (!IS_VALLEYVIEW (dev->device_id) && !IS_CHERRYVIEW (dev->device_id)) {usage (argv[0 ]);tools/intel_iosf_sb_write.c +3
-0@@ -89,6 +89,9 @@ int main(int argc, char** argv)int i, nregs;const char *name; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +if (!IS_VALLEYVIEW (dev->device_id) && !IS_CHERRYVIEW (dev->device_id)) {usage (argv[0 ]);tools/intel_reg_dumper.c +3
-0@@ -2931,6 +2931,9 @@ int main(int argc, char** argv)char *file =NULL , *reg_name =NULL ;uint32_t reg_val, power_well; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +while ((opt =getopt (argc, argv,"d:h" )) !=-1 ) {switch (opt) {case 'd' :tools/intel_reg_read.c +3
-0@@ -74,6 +74,9 @@ int main(int argc, char** argv)int decode_bits =0 ;int dwords =1 ; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +while ((ch =getopt (argc, argv,"dfhc:" )) !=-1 ) {switch (ch) {case 'd' :tools/intel_reg_snapshot.c +4
-0@@ -26,6 +26,7 @@#include <unistd.h> #include <assert.h> +#include <stdio.h> #include "intel_io.h" #include "intel_chipset.h" @@ -36,6 +37,9 @@ int main(int argc, char** argv)int mmio_bar;int ret; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); + pci_dev =intel_get_pci_device (); devid = pci_dev->device_id;intel_mmio_use_pci_bar (pci_dev);tools/intel_reg_write.c +3
-0@@ -36,6 +36,9 @@ int main(int argc, char** argv) {uint32_t reg, value; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +if (argc <3 ) {printf ("Usage: %s addr value\n" , argv[0 ]);printf (" WARNING: This is dangerous to you and your system's health.\n" );tools/intel_vga_read.c +3
-0@@ -57,6 +57,9 @@ int main(int argc, char *argv[])int i, ch;const char *cmdname = argv[0 ]; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +while ((ch =getopt (argc, argv,"m" )) !=-1 ) {switch (ch) {case 'm' :tools/intel_vga_write.c +3
-0@@ -57,6 +57,9 @@ int main(int argc, char *argv[])int ch;const char *cmdname = argv[0 ]; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +while ((ch =getopt (argc, argv,"m" )) !=-1 ) {switch (ch) {case 'm' :Signature · 6 lines
2.4.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Jani Nikula
Quoted 6 lines · Daniel Vetter
Quoted 2 lines · Thomas Wood
Cc Jani Nikula <[email protected]>Signed-off-by Thomas Wood <[email protected]>I'd go even one step further and do an exec using the corresponding
intel_regcommandline. On top of this patch ofc.IMO more work than it's worth.
I looked at this, but the output and options of intel_reg don't quite match those of tools it is replacing, so it's not an exact replacement.
Quoted 6 lines
Quoted 3 lines
Then we could nuke a lot of the existing boilerplate already and then perhaps nuke all the tools one release later on or so.
Hmm didn't we already make a release with the warnings? I'd just nuke the deprecated ones from git now.
Yes, the 1.11 release has the warnings.
Quoted 152 lines
BR,
Jani.Quoted 136 lines
-Daniel
Quoted 134 lines
--- tools/intel_iosf_sb_read.c | 3 +++ tools/intel_iosf_sb_write.c | 3 +++ tools/intel_reg_dumper.c | 3 +++ tools/intel_reg_read.c | 3 +++ tools/intel_reg_snapshot.c | 4 ++++ tools/intel_reg_write.c | 3 +++ tools/intel_vga_read.c | 3 +++ tools/intel_vga_write.c | 3 +++ 8 files changed, 25 insertions(+)tools/intel_iosf_sb_read.c +3
-0@@ -94,6 +94,9 @@ int main(int argc, char *argv[])int i, nregs, count =1 , reg_stride;const char *name; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +if (!IS_VALLEYVIEW (dev->device_id) && !IS_CHERRYVIEW (dev->device_id)) {usage (argv[0 ]);tools/intel_iosf_sb_write.c +3
-0@@ -89,6 +89,9 @@ int main(int argc, char** argv)int i, nregs;const char *name; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +if (!IS_VALLEYVIEW (dev->device_id) && !IS_CHERRYVIEW (dev->device_id)) {usage (argv[0 ]);tools/intel_reg_dumper.c +3
-0@@ -2931,6 +2931,9 @@ int main(int argc, char** argv)char *file =NULL , *reg_name =NULL ;uint32_t reg_val, power_well; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +while ((opt =getopt (argc, argv,"d:h" )) !=-1 ) {switch (opt) {case 'd' :tools/intel_reg_read.c +3
-0@@ -74,6 +74,9 @@ int main(int argc, char** argv)int decode_bits =0 ;int dwords =1 ; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +while ((ch =getopt (argc, argv,"dfhc:" )) !=-1 ) {switch (ch) {case 'd' :tools/intel_reg_snapshot.c +4
-0@@ -26,6 +26,7 @@#include <unistd.h> #include <assert.h> +#include <stdio.h> #include "intel_io.h" #include "intel_chipset.h" @@ -36,6 +37,9 @@ int main(int argc, char** argv)int mmio_bar;int ret; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); + pci_dev =intel_get_pci_device (); devid = pci_dev->device_id;intel_mmio_use_pci_bar (pci_dev);tools/intel_reg_write.c +3
-0@@ -36,6 +36,9 @@ int main(int argc, char** argv) {uint32_t reg, value; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +if (argc <3 ) {printf ("Usage: %s addr value\n" , argv[0 ]);printf (" WARNING: This is dangerous to you and your system's health.\n" );tools/intel_vga_read.c +3
-0@@ -57,6 +57,9 @@ int main(int argc, char *argv[])int i, ch;const char *cmdname = argv[0 ]; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +while ((ch =getopt (argc, argv,"m" )) !=-1 ) {switch (ch) {case 'm' :tools/intel_vga_write.c +3
-1@@ -57,6 +57,9 @@ int main(int argc, char *argv[])int ch;const char *cmdname = argv[0 ]; +fprintf (stderr,"WARNING: Use of %s has been deprecated and replaced by" +" intel_reg.\n" , argv[0 ]); +while ((ch =getopt (argc, argv,"m" )) !=-1 ) {switch (ch) {case 'm' : --2.4.2
Quoted 9 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Quoted 2 lines
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 17 lines · Thomas Wood
Quoted 9 lines · Jani Nikula
Quoted 6 lines · Daniel Vetter
Quoted 2 lines · Thomas Wood
Cc Jani Nikula <[email protected]>Signed-off-by Thomas Wood <[email protected]>I'd go even one step further and do an exec using the corresponding
intel_regcommandline. On top of this patch ofc.IMO more work than it's worth.
I looked at this, but the output and options of
intel_regdon't quite match those of tools it is replacing, so it's not an exact replacement.Quoted 1 line
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Then we could nuke a lot of the existing boilerplate already and then perhaps nuke all the tools one release later on or so.
Hmm didn't we already make a release with the warnings? I'd just nuke the deprecated ones from git now.
Yes, the 1.11 release has the warnings.
Ah in that case let's just move ahead and nuke them all. -Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx