From nobody Thu Oct 5 15:35:01 2023 X-Original-To: dev-commits-src-main@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 4S1bGY6wz7z4vnR8; Thu, 5 Oct 2023 15:35:01 +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 4S1bGY5s4zz4cgb; Thu, 5 Oct 2023 15:35:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696520101; 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=vkY4O1E3f4sK4vfCuFENKlTa7y0lI1gWvkW6t/8nquE=; b=rb/Aca8oFE8FeT3wIz1/bU+qm74Q91xb6n7Ebz+wdRSP4GDLykUQq5G5sPXXsTYwKb90S8 PGs1eQeILqzyetkVU+aUk3WoI2imfO3Kdfn4AmBXqlFtkoQ99yKTaOmQN+sEGzwvN90o5w +4fOlKciVzvWfIA67J8RJXjB2+qL38ISIeu4fXgDzMn35OckXwql53S5SQgoNcIESPiY6G wvSY3t4hooUSHORDTTsWAXVabNsaH5kBCnUJJjhGgCZE5auvvQD106KHJEqGTwtwutLsn0 rlpubyFeK/5oS0qqovlLgvwzyi+vdSIlysCzf7fKsqB+umlKinLbqezpnHa+nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696520101; a=rsa-sha256; cv=none; b=P9fIBGI3axkBTFCQSGg5Fe8ZrLewgTsKAwBGA/F4ByQ6TQ846wbsjA/3cLZft0r7Y0kaiM deC3nFTDMfbZtLHatKFT9sRrTzNtBAitD/iFI61bKfgOpw8JRpWb34nlR3ZvTrgHm/+36f lXdg7HcZ5nKDLiwGbqtJpdiiVuBa+9uLBaumFdC/W2RhUcnVPPpCo/x1UUkPf2r7hgfgMP UnrNaTQcgn7zTCTOpEatVknRmdh8FLoCPhVbD5yYQ80EVgqpxZ4JllauBx7wSnb23g+orn eumwytH1geWVFUljAI1MhNgAavcsQv1kx52Cob7nnkMSkj3FRvU5MvFHHBGilw== 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=1696520101; 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=vkY4O1E3f4sK4vfCuFENKlTa7y0lI1gWvkW6t/8nquE=; b=BbuqAVNiwXdkkGDFa6+y5/bI6NbJFlEDwoUKgb6RNIOr3LjfhFfajyEMUNzjZ+qTh+E1ah om0QtVo1G2ZtumWVkpB7Z7S4Q6KEDpfDV0iqQFJGWfnuP46i/KVjR/Dee3jAhENdLDT/hB ZE7piRkkGjb/cgdjywR0T/1WghhuxRSUuB881X041zFHD+igytaYFA6wP29LFHLICgo0Ze TgmkLXjm6xSWtdkg1ZAUI91LPWZqDky/3vYzQ+nUtmM+g+7haSWjJ/EHdtuRRUDd0mDI8I 5ozNexxXYS7YuUBwia5wia6rtwenWjZMyYJxtjiHHr5iTHBpYD775LXQEdbdgA== 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 4S1bGY4tz6z1QJh; Thu, 5 Oct 2023 15:35:01 +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 395FZ1es012347; Thu, 5 Oct 2023 15:35:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395FZ1ef012344; Thu, 5 Oct 2023 15:35:01 GMT (envelope-from git) Date: Thu, 5 Oct 2023 15:35:01 GMT Message-Id: <202310051535.395FZ1ef012344@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: c36125f6cc8b - main - dwc: Rename if_dwc.h to dwc1000_reg.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c36125f6cc8b3577f913da757ae588dd357a765c Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=c36125f6cc8b3577f913da757ae588dd357a765c commit c36125f6cc8b3577f913da757ae588dd357a765c Author: Emmanuel Vadot AuthorDate: 2023-09-25 17:56:31 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-05 15:34:39 +0000 dwc: Rename if_dwc.h to dwc1000_reg.h Synopsis/Designware controller have multiple version. The version currently supported by dwc(4) is the version 3 and it's usually called 1000 for gigabit. This file only have definition for the registers of this version so rename it. No functional changes intended. --- sys/dev/dwc/{if_dwc.h => dwc1000_reg.h} | 7 +++---- sys/dev/dwc/if_dwc.c | 5 +++-- sys/dev/dwc/if_dwc_aw.c | 13 +++++++------ sys/dev/dwc/if_dwc_if.m | 2 +- sys/dev/dwc/if_dwc_rk.c | 7 ++++--- sys/dev/dwc/if_dwc_socfpga.c | 7 ++++--- 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/sys/dev/dwc/if_dwc.h b/sys/dev/dwc/dwc1000_reg.h similarity index 99% rename from sys/dev/dwc/if_dwc.h rename to sys/dev/dwc/dwc1000_reg.h index be27b189e4e8..1f0957b688ac 100644 --- a/sys/dev/dwc/if_dwc.h +++ b/sys/dev/dwc/dwc1000_reg.h @@ -1,6 +1,5 @@ /*- * Copyright (c) 2014 Ruslan Bukin - * All rights reserved. * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) @@ -32,8 +31,8 @@ * Register names were taken almost as is from the documentation. */ -#ifndef __IF_DWC_H__ -#define __IF_DWC_H__ +#ifndef __DWC1000_REG_H__ +#define __DWC1000_REG_H__ #define PHY_MODE_UNKNOWN 0x0 #define PHY_MODE_RMII 0x1 @@ -302,4 +301,4 @@ #define GMAC_MII_CLK_DIV16 0xe #define GMAC_MII_CLK_DIV18 0xf -#endif /* __IF_DWC_H__ */ +#endif /* __DWC1000_REG_H__ */ diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 6dca1e204c41..86e00c76a1be 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -63,14 +63,15 @@ #include #include -#include -#include #include #include #include #include #include +#include +#include + #include "if_dwc_if.h" #include "gpio_if.h" #include "miibus_if.h" diff --git a/sys/dev/dwc/if_dwc_aw.c b/sys/dev/dwc/if_dwc_aw.c index 2e34a311b0a7..e6cf30f91fc3 100644 --- a/sys/dev/dwc/if_dwc_aw.c +++ b/sys/dev/dwc/if_dwc_aw.c @@ -36,17 +36,18 @@ #include -#include -#include - -#include -#include #include #include -#include +#include +#include #include +#include + +#include +#include + #include "if_dwc_if.h" static int diff --git a/sys/dev/dwc/if_dwc_if.m b/sys/dev/dwc/if_dwc_if.m index 8e3a4196fdbf..0d0d9ee114f7 100644 --- a/sys/dev/dwc/if_dwc_if.m +++ b/sys/dev/dwc/if_dwc_if.m @@ -27,7 +27,7 @@ INTERFACE if_dwc; -#include +#include CODE { static int diff --git a/sys/dev/dwc/if_dwc_rk.c b/sys/dev/dwc/if_dwc_rk.c index 49cf5fef7808..d05352a27793 100644 --- a/sys/dev/dwc/if_dwc_rk.c +++ b/sys/dev/dwc/if_dwc_rk.c @@ -38,15 +38,16 @@ #include #include +#include +#include + #include #include #include #include -#include #include -#include -#include +#include #include "if_dwc_if.h" #include "syscon_if.h" diff --git a/sys/dev/dwc/if_dwc_socfpga.c b/sys/dev/dwc/if_dwc_socfpga.c index 63a19ed12977..7b4ead1a940c 100644 --- a/sys/dev/dwc/if_dwc_socfpga.c +++ b/sys/dev/dwc/if_dwc_socfpga.c @@ -42,13 +42,14 @@ #include +#include +#include + #include #include -#include #include -#include -#include +#include #include "if_dwc_if.h"