From f47a871685b98aa7320fa7873f06c21a07c37e6d Mon Sep 17 00:00:00 2001 From: Mats Engstrom <mats@bergus.se> Date: Sat, 10 Jun 2023 22:01:20 +0200 Subject: [PATCH] Change hidden cmd -p (info) to -i. Add more & reformat info --- minichlink/minichlink.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/minichlink/minichlink.c b/minichlink/minichlink.c index cc82d57..cd28b70 100644 --- a/minichlink/minichlink.c +++ b/minichlink/minichlink.c @@ -305,7 +305,7 @@ keep_going: goto unimplemented; break; } - case 'p': + case 'i': { if( MCF.PrintChipInfo ) MCF.PrintChipInfo( dev ); @@ -543,6 +543,7 @@ help: fprintf( stderr, " -A Go into Halt without reboot\n" ); fprintf( stderr, " -D Configure NRST as GPIO\n" ); fprintf( stderr, " -d Configure NRST as NRST\n" ); + fprintf( stderr, " -i Show chip info\n" ); fprintf( stderr, " -s [debug register] [value]\n" ); fprintf( stderr, " -m [debug register]\n" ); fprintf( stderr, " -T Terminal Only\n" ); @@ -1780,13 +1781,13 @@ int DefaultPrintChipInfo( void * dev ) MCF.HaltMode( dev, 5 ); if( MCF.ReadWord( dev, 0x1FFFF800, ® ) ) goto fail; - printf( "USER/RDPR: %08x\n", reg ); -/* if( MCF.ReadWord( dev, 0x1FFFF804, ® ) ) goto fail; - printf( "NDATA: %08x\n", reg ); + printf( "USER/RDPR : %04x/%04x\n", reg>>16, reg&0xFFFF ); + if( MCF.ReadWord( dev, 0x1FFFF804, ® ) ) goto fail; + printf( "DATA1/DATA0: %04x/%04x\n", reg>>16, reg&0xFFFF ); if( MCF.ReadWord( dev, 0x1FFFF808, ® ) ) goto fail; - printf( "WRPR01: %08x\n", reg ); + printf( "WRPR1/WRPR0: %04x/%04x\n", reg>>16, reg&0xFFFF ); if( MCF.ReadWord( dev, 0x1FFFF80c, ® ) ) goto fail; - printf( "WRPR23: %08x\n", reg );*/ + printf( "WRPR3/WRPR2: %04x/%04x\n", reg>>16, reg&0xFFFF ); if( MCF.ReadWord( dev, 0x1FFFF7E0, ® ) ) goto fail; printf( "Flash Size: %d kB\n", (reg&0xffff) ); if( MCF.ReadWord( dev, 0x1FFFF7E8, ® ) ) goto fail; -- GitLab