All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael Tokarev <mjt@tls.msk.ru>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org,
	Peter Crosthwaite <peter.crosthwaite@xilinx.com>,
	Michael Tokarev <mjt@tls.msk.ru>
Subject: [Qemu-devel] [PULL 03/25] net: cadence_gem: Comment spelling sweep
Date: Tue, 10 Jun 2014 20:08:21 +0400	[thread overview]
Message-ID: <1402416523-13212-4-git-send-email-mjt@msgid.tls.msk.ru> (raw)
In-Reply-To: <1402416523-13212-1-git-send-email-mjt@msgid.tls.msk.ru>

From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

Fix some typos in comments.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 hw/net/cadence_gem.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index cfb696a..fe40b4e 100644
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -50,7 +50,7 @@
 #define GEM_IER           (0x00000028/4) /* Interrupt Enable reg */
 #define GEM_IDR           (0x0000002C/4) /* Interrupt Disable reg */
 #define GEM_IMR           (0x00000030/4) /* Interrupt Mask reg */
-#define GEM_PHYMNTNC      (0x00000034/4) /* Phy Maintaince reg */
+#define GEM_PHYMNTNC      (0x00000034/4) /* Phy Maintenance reg */
 #define GEM_RXPAUSE       (0x00000038/4) /* RX Pause Time reg */
 #define GEM_TXPAUSE       (0x0000003C/4) /* TX Pause Time reg */
 #define GEM_TXPARTIALSF   (0x00000040/4) /* TX Partial Store and Forward */
@@ -150,7 +150,7 @@
 #define GEM_NWCTRL_LOCALLOOP   0x00000002 /* Local Loopback */
 
 #define GEM_NWCFG_STRIP_FCS    0x00020000 /* Strip FCS field */
-#define GEM_NWCFG_LERR_DISC    0x00010000 /* Discard RX frames with lenth err */
+#define GEM_NWCFG_LERR_DISC    0x00010000 /* Discard RX frames with len err */
 #define GEM_NWCFG_BUFF_OFST_M  0x0000C000 /* Receive buffer offset mask */
 #define GEM_NWCFG_BUFF_OFST_S  14         /* Receive buffer offset shift */
 #define GEM_NWCFG_UCAST_HASH   0x00000080 /* accept unicast if hash match */
@@ -397,7 +397,7 @@ static const uint8_t broadcast_addr[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
  */
 static void gem_init_register_masks(GemState *s)
 {
-    /* Mask of register bits which are read only*/
+    /* Mask of register bits which are read only */
     memset(&s->regs_ro[0], 0, sizeof(s->regs_ro));
     s->regs_ro[GEM_NWCTRL]   = 0xFFF80000;
     s->regs_ro[GEM_NWSTATUS] = 0xFFFFFFFF;
@@ -719,7 +719,7 @@ static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)
         unsigned crc_val;
 
         /* The application wants the FCS field, which QEMU does not provide.
-         * We must try and caclculate one.
+         * We must try and calculate one.
          */
 
         memcpy(rxbuf, buf, size);
@@ -871,7 +871,7 @@ static void gem_transmit(GemState *s)
 
     DB_PRINT("\n");
 
-    /* The packet we will hand off to qemu.
+    /* The packet we will hand off to QEMU.
      * Packets scattered across multiple descriptors are gathered to this
      * one contiguous buffer first.
      */
@@ -923,7 +923,7 @@ static void gem_transmit(GemState *s)
             tx_desc_set_used(desc_first);
             cpu_physical_memory_write(s->tx_desc_addr, (uint8_t *)desc_first,
                                       sizeof(desc_first));
-            /* Advance the hardare current descriptor past this packet */
+            /* Advance the hardware current descriptor past this packet */
             if (tx_desc_get_wrap(desc)) {
                 s->tx_desc_addr = s->regs[GEM_TXQBASE];
             } else {
-- 
1.7.10.4

  parent reply	other threads:[~2014-06-10 16:28 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-10 16:08 [Qemu-devel] [PULL 00/25] Trivial patches for 2014-06-10 Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 01/25] net: cadence_gem: Fix Tx descriptor update Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 02/25] net: cadence_gem: Add Tx descriptor fetch printf Michael Tokarev
2014-06-10 16:08 ` Michael Tokarev [this message]
2014-06-10 16:08 ` [Qemu-devel] [PULL 04/25] net: cadence_gem: Remove &desc[0] usages Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 05/25] qtest: fix hex2nib for capital characters Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 06/25] slirp: Remove unused zero_ethaddr[] variable Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 07/25] hw/i386/pc.c: Remove unused parallel_io and parallel_irq variables Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 08/25] hw/sd/sd.c: Drop unused sd_acmd_type[] array Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 09/25] util/qemu-sockets.c: Avoid unused variable warnings Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 10/25] hw/dma/xilinx_axidma: Remove unused stream_halted() function Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 11/25] hw/intc/openpic: Remove unused function IRQ_testbit() Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 12/25] hw/isa/pc87312: Remove unused function is_parallel_epp() Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 13/25] target-i386/translate.c: Remove unused tcg_gen_lshift() Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 14/25] hw/misc/milkymist-softusb: Remove unused softusb_{read, write}_pmem() Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 15/25] target-microblaze: Delete unused sign_extend() function Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 16/25] hw/net/ne2000-isa: Register vmstate struct Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 17/25] apb: Fix compiler warnings (large constants) Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 18/25] vdi: remove double conversion Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 19/25] smbios: use g_free directly on NULL pointers Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 20/25] cpu/x86: correctly set errors in x86_cpu_parse_featurestr Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 21/25] libcacard: Drop superfluous conditionals around g_free() Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 22/25] libcacard: Clean up dead stores before g_free() Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 23/25] migration: Plug memory leak in migrate-set-cache-size command Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 24/25] hw: vmware_vga: don't return cursorx when the driver asks for cursory register Michael Tokarev
2014-06-10 16:08 ` [Qemu-devel] [PULL 25/25] virtio.c: fix error message Michael Tokarev
2014-06-10 16:51 ` [Qemu-devel] [PULL 00/25] Trivial patches for 2014-06-10 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1402416523-13212-4-git-send-email-mjt@msgid.tls.msk.ru \
    --to=mjt@tls.msk.ru \
    --cc=peter.crosthwaite@xilinx.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.