提交 4ff9786c 编写于 作者: S Stefan Weil 提交者: Aurelien Jarno

Fix trivial "endianness bugs"

Replace endianess -> endianness.
Signed-off-by: NStefan Weil <weil@mail.berlios.de>
Signed-off-by: NAurelien Jarno <aurelien@aurel32.net>
上级 2055283b
...@@ -139,36 +139,36 @@ static int aud_to_sdlfmt (audfmt_e fmt) ...@@ -139,36 +139,36 @@ static int aud_to_sdlfmt (audfmt_e fmt)
} }
} }
static int sdl_to_audfmt (int sdlfmt, audfmt_e *fmt, int *endianess) static int sdl_to_audfmt(int sdlfmt, audfmt_e *fmt, int *endianness)
{ {
switch (sdlfmt) { switch (sdlfmt) {
case AUDIO_S8: case AUDIO_S8:
*endianess = 0; *endianness = 0;
*fmt = AUD_FMT_S8; *fmt = AUD_FMT_S8;
break; break;
case AUDIO_U8: case AUDIO_U8:
*endianess = 0; *endianness = 0;
*fmt = AUD_FMT_U8; *fmt = AUD_FMT_U8;
break; break;
case AUDIO_S16LSB: case AUDIO_S16LSB:
*endianess = 0; *endianness = 0;
*fmt = AUD_FMT_S16; *fmt = AUD_FMT_S16;
break; break;
case AUDIO_U16LSB: case AUDIO_U16LSB:
*endianess = 0; *endianness = 0;
*fmt = AUD_FMT_U16; *fmt = AUD_FMT_U16;
break; break;
case AUDIO_S16MSB: case AUDIO_S16MSB:
*endianess = 1; *endianness = 1;
*fmt = AUD_FMT_S16; *fmt = AUD_FMT_S16;
break; break;
case AUDIO_U16MSB: case AUDIO_U16MSB:
*endianess = 1; *endianness = 1;
*fmt = AUD_FMT_U16; *fmt = AUD_FMT_U16;
break; break;
...@@ -338,7 +338,7 @@ static int sdl_init_out (HWVoiceOut *hw, struct audsettings *as) ...@@ -338,7 +338,7 @@ static int sdl_init_out (HWVoiceOut *hw, struct audsettings *as)
SDLVoiceOut *sdl = (SDLVoiceOut *) hw; SDLVoiceOut *sdl = (SDLVoiceOut *) hw;
SDLAudioState *s = &glob_sdl; SDLAudioState *s = &glob_sdl;
SDL_AudioSpec req, obt; SDL_AudioSpec req, obt;
int endianess; int endianness;
int err; int err;
audfmt_e effective_fmt; audfmt_e effective_fmt;
struct audsettings obt_as; struct audsettings obt_as;
...@@ -354,7 +354,7 @@ static int sdl_init_out (HWVoiceOut *hw, struct audsettings *as) ...@@ -354,7 +354,7 @@ static int sdl_init_out (HWVoiceOut *hw, struct audsettings *as)
return -1; return -1;
} }
err = sdl_to_audfmt (obt.format, &effective_fmt, &endianess); err = sdl_to_audfmt(obt.format, &effective_fmt, &endianness);
if (err) { if (err) {
sdl_close (s); sdl_close (s);
return -1; return -1;
...@@ -363,7 +363,7 @@ static int sdl_init_out (HWVoiceOut *hw, struct audsettings *as) ...@@ -363,7 +363,7 @@ static int sdl_init_out (HWVoiceOut *hw, struct audsettings *as)
obt_as.freq = obt.freq; obt_as.freq = obt.freq;
obt_as.nchannels = obt.channels; obt_as.nchannels = obt.channels;
obt_as.fmt = effective_fmt; obt_as.fmt = effective_fmt;
obt_as.endianness = endianess; obt_as.endianness = endianness;
audio_pcm_init_info (&hw->info, &obt_as); audio_pcm_init_info (&hw->info, &obt_as);
hw->samples = obt.samples; hw->samples = obt.samples;
......
...@@ -113,7 +113,7 @@ void uuid_unparse(const uuid_t uu, char *out); ...@@ -113,7 +113,7 @@ void uuid_unparse(const uuid_t uu, char *out);
*/ */
#define VDI_TEXT "<<< QEMU VM Virtual Disk Image >>>\n" #define VDI_TEXT "<<< QEMU VM Virtual Disk Image >>>\n"
/* Unallocated blocks use this index (no need to convert endianess). */ /* Unallocated blocks use this index (no need to convert endianness). */
#define VDI_UNALLOCATED UINT32_MAX #define VDI_UNALLOCATED UINT32_MAX
#if !defined(CONFIG_UUID) #if !defined(CONFIG_UUID)
...@@ -194,7 +194,7 @@ typedef struct { ...@@ -194,7 +194,7 @@ typedef struct {
uint32_t block_sectors; uint32_t block_sectors;
/* First sector of block map. */ /* First sector of block map. */
uint32_t bmap_sector; uint32_t bmap_sector;
/* VDI header (converted to host endianess). */ /* VDI header (converted to host endianness). */
VdiHeader header; VdiHeader header;
} BDRVVdiState; } BDRVVdiState;
......
...@@ -923,7 +923,7 @@ static void dec_load(DisasContext *dc) ...@@ -923,7 +923,7 @@ static void dec_load(DisasContext *dc)
/* /*
* When doing reverse accesses we need to do two things. * When doing reverse accesses we need to do two things.
* *
* 1. Reverse the address wrt endianess. * 1. Reverse the address wrt endianness.
* 2. Byteswap the data lanes on the way back into the CPU core. * 2. Byteswap the data lanes on the way back into the CPU core.
*/ */
if (rev && size != 4) { if (rev && size != 4) {
......
...@@ -63,7 +63,7 @@ union fpr_t { ...@@ -63,7 +63,7 @@ union fpr_t {
uint32_t w[2]; /* binary single fixed-point */ uint32_t w[2]; /* binary single fixed-point */
}; };
/* define FP_ENDIAN_IDX to access the same location /* define FP_ENDIAN_IDX to access the same location
* in the fpr_t union regardless of the host endianess * in the fpr_t union regardless of the host endianness
*/ */
#if defined(HOST_WORDS_BIGENDIAN) #if defined(HOST_WORDS_BIGENDIAN)
# define FP_ENDIAN_IDX 1 # define FP_ENDIAN_IDX 1
......
...@@ -464,7 +464,7 @@ static int usb_host_scan(void *opaque, USBScanFunc *func) ...@@ -464,7 +464,7 @@ static int usb_host_scan(void *opaque, USBScanFunc *func)
printf("usb_host_scan: couldn't get device information for %s - %s\n", printf("usb_host_scan: couldn't get device information for %s - %s\n",
devbuf, strerror(errno)); devbuf, strerror(errno));
// XXX: might need to fixup endianess of word values before copying over /* XXX: might need to fixup endianness of word values before copying over */
vendor_id = dev_info.udi_vendorNo; vendor_id = dev_info.udi_vendorNo;
product_id = dev_info.udi_productNo; product_id = dev_info.udi_productNo;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册