From nobody Sat May 04 14:44:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VWr6J1nvtz5KgRZ; Sat, 4 May 2024 14:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VWr6J0nchz4QtJ; Sat, 4 May 2024 14:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714833864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U5qi4oSPKOdnYBK4akj4zq798GdkJr0zyGwoCGuZsBA=; b=EBioWPVPIKQg0LaTCwLdwMkQL/XkS9vD5T5GJdtAT7GMu8MN+mTeSdwUObQuUFMYO2dnMy vIvhFhTjsEkHtajNJqHl6jnll79Vo0dbdkSiNlL6670sWFjNj+RaJc5w+2Ll0YwFS2Ixtr JczMnKUPgv2qf0LD4i2DGD8OUDQSRx+KZaAcpCJU9xD/0QLGd8cCRMm3NVHPR25k0McUaQ vXsjQ+teKq/6lEkVHZhFjtxtx95U4Gwbjm82oZezFUpsp6zrnclm8+Dw6IJrwU0ssCpO6O 3JidosTUbj6+kUM/r9MJkasrCfPBCZOXMLvrX4wz/2aHidSTChDDYor31o+1UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714833864; a=rsa-sha256; cv=none; b=MsOexVCChpw2a4kWvFiUYzaiggphueSto/G1muXHfynST6U/BKjhfPQshge2m+FFIU2hIR nGjELY8tM+/+CdlIYOemOL0hS53KnxSlZpUX2v1rEbVpXY7kz25zvQar6BOjvFcZ2Ze/6A lmP7mkjwcz4AxPzUEFWFUQMmyhCyEcO0jGvUOXSCdToBp6ApSVFUIz4EjcYa97nl82jGnL JpaHjNZMHxZ5NDnwWY52+N+uphGEzSKI9AH88G4ycnj9L8HjNNF7ddMUUDUzMRzcGnA7pX Cl6IDx3ZB0Egss5+0BLgnzw2g/pcZEVUQxodEb3/dqW49CHEftcuSQGS3hvc/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714833864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U5qi4oSPKOdnYBK4akj4zq798GdkJr0zyGwoCGuZsBA=; b=sa+YcQWf18WYFaGWnNI5k5YQfKL19BQlMuiB23jH6WNxTiEsNDkF56hCMPFwNkBSuik/Rc pNdrsyM31tVh4cxcATpK9rkMrtxCjdJWJ0hWZPWSxqJdN80V4dfhtVlnm2m13eyX9zyRNb uOOCkvFOdl9AKtrdoaf1fHb6gmj28UmDUhkqU6BAWB45/ibZcbVY0b/6p6dczcv6t1bUv0 fmoMMvVKnTlnEPqN1rEAq40UUpcCZ52scJWbkZmHQ9yphdseqXBkZpLyKj5wvxyP7t1Rvk RiUTAk6x4CfPgOz4ZIVGiEA6uCaH50QcW7hvkrNQq2mux/L8tUCqJ708H1wTRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VWr6J0HrfzZVc; Sat, 4 May 2024 14:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 444EiNTW094447; Sat, 4 May 2024 14:44:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 444EiNW8094444; Sat, 4 May 2024 14:44:23 GMT (envelope-from git) Date: Sat, 4 May 2024 14:44:23 GMT Message-Id: <202405041444.444EiNW8094444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 34db47a9dbc7 - main - aic7xxx: aicasm correct include file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34db47a9dbc76c09019e2bfa37d23e28e477a506 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=34db47a9dbc76c09019e2bfa37d23e28e477a506 commit 34db47a9dbc76c09019e2bfa37d23e28e477a506 Author: HP van Braam AuthorDate: 2024-05-04 14:36:47 +0000 Commit: Warner Losh CommitDate: 2024-05-04 14:39:02 +0000 aic7xxx: aicasm correct include file aicasm just puts the value of the "-i" passed include file in the generated file with quotes around it. This means that there are manual edits made to aic7xxx_reg_print.c and aic79xx_reg_print.c now we check to see if the value passed to '-i' starts with a '<', if it does don't output the quotes. Signed-off-by: HP van Braam Reviewed by: imp (minor code simplification) Pull Request: https://github.com/freebsd/freebsd-src/pull/1209 --- sys/dev/aic7xxx/aicasm/aicasm_symbol.c | 7 +++++-- sys/modules/aic7xxx/ahc/Makefile | 2 +- sys/modules/aic7xxx/ahd/Makefile | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c index d3bca594b468..95d9da9be1b7 100644 --- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c +++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c @@ -343,10 +343,13 @@ aic_print_file_prologue(FILE *ofile) static void aic_print_include(FILE *dfile, char *header_file) { - if (dfile == NULL) return; - fprintf(dfile, "\n#include \"%s\"\n\n", header_file); + + if (header_file[0] == '<') + fprintf(dfile, "\n#include %s\n\n", header_file); + else + fprintf(dfile, "\n#include \"%s\"\n\n", header_file); } static void diff --git a/sys/modules/aic7xxx/ahc/Makefile b/sys/modules/aic7xxx/ahc/Makefile index 8fc4c68feebb..1ced6c050397 100644 --- a/sys/modules/aic7xxx/ahc/Makefile +++ b/sys/modules/aic7xxx/ahc/Makefile @@ -28,7 +28,7 @@ ${GENSRCS}: \ -I${SYSDIR}/dev/aic7xxx \ -o aic7xxx_seq.h -r aic7xxx_reg.h \ ${REG_PRINT_OPT} \ - -i ${SYSDIR}/dev/aic7xxx/aic7xxx_osm.h \ + -i "" \ ${SYSDIR}/dev/aic7xxx/aic7xxx.seq .elif defined(.MAKE.LEVEL) # This target interfers with fmake's world view and causes this message diff --git a/sys/modules/aic7xxx/ahd/Makefile b/sys/modules/aic7xxx/ahd/Makefile index 2fff21f332e9..cf68651e792c 100644 --- a/sys/modules/aic7xxx/ahd/Makefile +++ b/sys/modules/aic7xxx/ahd/Makefile @@ -17,11 +17,11 @@ ahdfirmware: ${GENSRCS} ${GENSRCS}: \ ${SRCTOP}/sys/dev/aic7xxx/aic79xx.{reg,seq} \ ${SRCTOP}/sys/cam/scsi/scsi_message.h - aicasm ${INCLUDES} -I${SRCTOP}/sys/cam/scsi \ + ../aicasm/aicasm ${INCLUDES} -I${SRCTOP}/sys/cam/scsi \ -I${SRCTOP}/sys/dev/aic7xxx \ -o aic79xx_seq.h -r aic79xx_reg.h \ ${REG_PRINT_OPT} \ - -i ${SRCTOP}/sys/dev/aic7xxx/aic79xx_osm.h \ + -i "" \ ${SRCTOP}/sys/dev/aic7xxx/aic79xx.seq .else ${GENSRCS}: .NOMETA