| Message ID | 20230823065335.1919380-15-mjt@tls.msk.ru |
|---|---|
| State | New |
| Headers | show |
| Series | tree-wide spelling fixes | expand |
On 23/8/23 08:53, Michael Tokarev wrote: > Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> > --- > hw/display/bochs-display.c | 2 +- > hw/display/qxl.c | 2 +- > hw/display/ssd0303.c | 2 +- > hw/display/ssd0323.c | 2 +- > hw/display/xlnx_dp.c | 2 +- > 5 files changed, 5 insertions(+), 5 deletions(-) > /* > - * Get some data from the DPDMA and compute these datas. > + * Get some data from the DPDMA and compute these data. > * Then wait for QEMU's audio subsystem to call this callback. > */ TIL 'data' is plural, thanks! Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
24.08.2023 13:12, Philippe Mathieu-Daudé wrote: >> hw/display/xlnx_dp.c | 2 +- >> - * Get some data from the DPDMA and compute these datas. >> + * Get some data from the DPDMA and compute these data. >> * Then wait for QEMU's audio subsystem to call this callback. >> */ > > TIL 'data' is plural, thanks! Actually I don't understand what it is supposed to mean, whole thing :) /mjt
On Thu, 24 Aug 2023 at 11:13, Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > > On 23/8/23 08:53, Michael Tokarev wrote: > > Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> > > --- > > hw/display/bochs-display.c | 2 +- > > hw/display/qxl.c | 2 +- > > hw/display/ssd0303.c | 2 +- > > hw/display/ssd0323.c | 2 +- > > hw/display/xlnx_dp.c | 2 +- > > 5 files changed, 5 insertions(+), 5 deletions(-) > > > /* > > - * Get some data from the DPDMA and compute these datas. > > + * Get some data from the DPDMA and compute these data. > > * Then wait for QEMU's audio subsystem to call this callback. > > */ > > TIL 'data' is plural, thanks! It *can* be the plural of 'datum', but 'data' is also a "mass noun" (the same way that 'butter' is always 'butter' and not '1 butter, 2 butters'). The OED has quotes for the mass-noun sense back as far as 1702, and in a computing context it is overwhelmingly the common use. Use of it in the plural in a comment in code is probably a mistake. I agree with mjt that it's unclear what was actually intended by this comment. My guess from the code is something like: /* * Get the individual left and right audio streams from * the DPDMA, and fill the output buffer with the * combined stereo audio data adjusted by the volume * controls. * QEMU's audio subsystem will call this callback * repeatedly; we return it the data from the output * buffer until it is emptied, and then we will read * data from the DPDMA again. */ and the following comment should be /* Don't get more data until we've emptied the buffer */ (or deleted as redundant with the expanded comment above.) -- PMM
diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c index e7ec268184..9138e98c3b 100644 --- a/hw/display/bochs-display.c +++ b/hw/display/bochs-display.c @@ -165,5 +165,5 @@ static int bochs_display_get_mode(BochsDisplayState *s, switch (vbe[VBE_DISPI_INDEX_BPP]) { case 16: - /* best effort: support native endianess only */ + /* best effort: support native endianness only */ mode->format = PIXMAN_r5g6b5; mode->bytepp = 2; diff --git a/hw/display/qxl.c b/hw/display/qxl.c index f1c0eb7dfc..af941fb0c2 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -1545,5 +1545,5 @@ static void qxl_create_guest_primary(PCIQXLDevice *qxl, int loadvm, } -/* return 1 if surface destoy was initiated (in QXL_ASYNC case) or +/* return 1 if surface destroy was initiated (in QXL_ASYNC case) or * done (in QXL_SYNC case), 0 otherwise. */ static int qxl_destroy_primary(PCIQXLDevice *d, qxl_async_io async) diff --git a/hw/display/ssd0303.c b/hw/display/ssd0303.c index d67b0ad7b5..32b32a3044 100644 --- a/hw/display/ssd0303.c +++ b/hw/display/ssd0303.c @@ -9,5 +9,5 @@ /* The controller can support a variety of different displays, but we only - implement one. Most of the commends relating to brightness and geometry + implement one. Most of the commands relating to brightness and geometry setup are ignored. */ diff --git a/hw/display/ssd0323.c b/hw/display/ssd0323.c index ab229d32b7..09b1bbed0a 100644 --- a/hw/display/ssd0323.c +++ b/hw/display/ssd0323.c @@ -9,5 +9,5 @@ /* The controller can support a variety of different displays, but we only - implement one. Most of the commends relating to brightness and geometry + implement one. Most of the commands relating to brightness and geometry setup are ignored. */ diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index b0828d65aa..822355ecc6 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -381,5 +381,5 @@ static void xlnx_dp_audio_callback(void *opaque, int avail) { /* - * Get some data from the DPDMA and compute these datas. + * Get some data from the DPDMA and compute these data. * Then wait for QEMU's audio subsystem to call this callback. */
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> --- hw/display/bochs-display.c | 2 +- hw/display/qxl.c | 2 +- hw/display/ssd0303.c | 2 +- hw/display/ssd0323.c | 2 +- hw/display/xlnx_dp.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)