From nobody Thu Oct 30 01:04:14 2025 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 4cxm8v1Bv5z6DNpj; Thu, 30 Oct 2025 01:04:15 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxm8v0ZTLz3cBc; Thu, 30 Oct 2025 01:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761786255; 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=H0FSk7XVzygULZ3RFwOnUJmb/u66Hgdg+Jlg2h1z3Os=; b=NgxzdH/HIDdLZ8Au1uTHPgQbWz/w7EDbqO8rt+5lPXJmzCkyKmcRWM75LYnERXitjY5hBJ XWi/g8HpkTpKU1Cyhxk23tUEqLz9UxqiOOrGpFVqi+cjLaKL3XRTeo6k9lshkBkq3b/1oZ l3kStANcCZlOnAXt+9goE9UF22vi8zb+uVWM/rmJQCpc5V64wbtgDHT/nsa/qjv5y13YDi J1e1JxXWNewzsM3JdTPo2/pMmmnFeOMPYXglgL7hQ4u2oeuaCfk7wwISgrwmhWl6L5zmNv YSQQBYeWF4rSBa5JSNvseFgtoVCj62MigjFcFgXLwlZndmFu7Ffw7pkN6bPWBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761786255; 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=H0FSk7XVzygULZ3RFwOnUJmb/u66Hgdg+Jlg2h1z3Os=; b=HgnK1kktGoamlTmUoGbOAxwwrcTdiuQCEl9PvUl/jPuZYH7/+jgOGxFlCOsV7YiYbx4LJQ 1+vBGHX0UDkaFCE3FlZfPUtRsdGN5nOhy4Ch4Y2pOMq+XfUh36OHHuUQxNu1/d32cj4ITL nHjzKKDT5rcDJt136af9kyyVuwTVF7QaScecd5JPto18cFu2sUZTM31nY5O1tK3a2ucnHm tCJfTf+9P9L4vtDe5TPXPUVo6QoF5hBF0PG8w4p7HAVhArU/mog54cZAYeFNWQoCPYMlrb jFZQ8PwS6mw/A2rgmq71Zko/Gca19pTYmxRQy3xE+UYO/qpIPYYtxp4JPQLB9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761786255; a=rsa-sha256; cv=none; b=bYL8V6GdR+thXED6LXwQWI8U7pqo6f2swaiQng0GmN9dflkKBUjKPwYOe42DyEc2YXHIxa cVra3CJ4m0ax6hO2bTxVojfQlqH49G016wEbfkZ77ACzBUZYPig3IqeS5JDVodwkj/FgkU QKzXbtbiYwy4rOu5AvuXVeKib7zHIr4r0/HnFa8yXkVpk6qmpAZ5oH7MLPaC5BP45g+z2L IyEmpjbxZXOPVXC/dYGBQMbDVrbRfsex9jzfWB37P/QpyPPpGUyG8RJg5/TdKaLGzSwQtw 1s+ZwDX1WeHu/FrscLjAwcbepgqfq9qAKlL0q+v+sN+z5x7TDDei5Q23tgHmVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cxm8t72kJz10yG; Thu, 30 Oct 2025 01:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59U14EmL007178; Thu, 30 Oct 2025 01:04:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U14Ent007175; Thu, 30 Oct 2025 01:04:14 GMT (envelope-from git) Date: Thu, 30 Oct 2025 01:04:14 GMT Message-Id: <202510300104.59U14Ent007175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 319a1dbcf46f - main - intr/powerpc: cleanup extraneous spaces in PowerMAC CPC HT driver 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 319a1dbcf46f4afd2d32234d6936bb9e9e006a74 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=319a1dbcf46f4afd2d32234d6936bb9e9e006a74 commit 319a1dbcf46f4afd2d32234d6936bb9e9e006a74 Author: Elliott Mitchell AuthorDate: 2025-01-10 00:52:52 +0000 Commit: Justin Hibbits CommitDate: 2025-10-30 01:01:00 +0000 intr/powerpc: cleanup extraneous spaces in PowerMAC CPC HT driver Spotted while examing this driver. Remove some end of line spaces/tabs. Replace some spaces which should instead be tabs. Reviewed by: jhibbits MFC after: 2 weeks --- sys/powerpc/powermac/cpcht.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/powerpc/powermac/cpcht.c b/sys/powerpc/powermac/cpcht.c index 138aefda5cdb..5b5c03cf83f6 100644 --- a/sys/powerpc/powermac/cpcht.c +++ b/sys/powerpc/powermac/cpcht.c @@ -113,7 +113,7 @@ static device_method_t cpcht_methods[] = { struct cpcht_irq { enum { IRQ_NONE, IRQ_HT, IRQ_MSI, IRQ_INTERNAL - } irq_type; + } irq_type; int ht_source; @@ -287,7 +287,7 @@ cpcht_configure_htbridge(device_t dev, phandle_t child) sc->htirq_map[irq].irq_type = IRQ_HT; sc->htirq_map[irq].ht_source = i; - sc->htirq_map[irq].ht_base = sc->sc_data + + sc->htirq_map[irq].ht_base = sc->sc_data + (((((s & 0x1f) << 3) | (f & 0x07)) << 8) | (ptr)); PCIB_WRITE_CONFIG(dev, b, s, f, @@ -298,13 +298,13 @@ cpcht_configure_htbridge(device_t dev, phandle_t child) /* * Apple uses a non-compliant IO/APIC that differs - * in how we signal EOIs. Check if this device was + * in how we signal EOIs. Check if this device was * made by Apple, and act accordingly. */ vend = PCIB_READ_CONFIG(dev, b, s, f, PCIR_DEVVENDOR, 4); if ((vend & 0xffff) == 0x106b) - sc->htirq_map[irq].apple_eoi = + sc->htirq_map[irq].apple_eoi = (sc->htirq_map[irq].ht_base - ptr) + 0x60; } } @@ -318,7 +318,7 @@ cpcht_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, vm_offset_t caoff; sc = device_get_softc(dev); - caoff = sc->sc_data + + caoff = sc->sc_data + (((((slot & 0x1f) << 3) | (func & 0x07)) << 8) | reg); if (bus == 0 && (!(sc->sc_populated_slots & (1 << slot)) || func > 0)) @@ -350,7 +350,7 @@ cpcht_write_config(device_t dev, u_int bus, u_int slot, u_int func, vm_offset_t caoff; sc = device_get_softc(dev); - caoff = sc->sc_data + + caoff = sc->sc_data + (((((slot & 0x1f) << 3) | (func & 0x07)) << 8) | reg); if (bus == 0 && (!(sc->sc_populated_slots & (1 << slot)) || func > 0)) @@ -553,7 +553,7 @@ openpic_cpcht_probe(device_t dev) const char *type = ofw_bus_get_type(dev); if (strcmp(type, "open-pic") != 0) - return (ENXIO); + return (ENXIO); device_set_desc(dev, OPENPIC_DEVSTR); return (0); @@ -582,7 +582,7 @@ openpic_cpcht_attach(device_t dev) * Interrupts 0-3 are internally sourced and are level triggered * active low. Interrupts 4-123 are connected to a pulse generator * and should be programmed as edge triggered low-to-high. - * + * * IBM CPC945 Manual, Section 9.3. */ @@ -631,7 +631,7 @@ openpic_cpcht_config(device_t dev, u_int irq, enum intr_trigger trig, /* Mask the IRQ while we fiddle settings */ out32rb(cpcht_irqmap[irq].ht_base + 4, ht_irq | HTAPIC_MASK); - + /* Program the interrupt sense */ ht_irq &= ~(HTAPIC_TRIGGER_LEVEL | HTAPIC_REQUEST_EOI); if (trig == INTR_TRIGGER_EDGE) { @@ -671,7 +671,7 @@ openpic_cpcht_enable(device_t dev, u_int irq, u_int vec, void **priv) mtx_unlock_spin(&sc->sc_ht_mtx); } - + openpic_cpcht_eoi(dev, irq, *priv); }