devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Convert non-ASCII characters to UTF-8

Browse source 
Comments and notes are converted to UTF-8. Already broken multibyte characters are fixed using common sense.

This patch contains no code changes.

Change-Id: Ia511ab84936cb2495ac17309493a9b98727a7902
This commit is contained in:
Vencislav Atanasov 2024-12-12 20:36:43 +02:00 • committed by Solomon Peachy
parent 8f5128da16
commit 5d7c8a0df1
32 changed files with 94 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

26
apps/iap/iap-lingo4.c
View file

@ -177,15 +177,15 @@ void iap_handlepkt_mode4(const unsigned int len, const unsigned char *buf)
* 4 0x00 Command ID (bits 15:8) * 4 0x00 Command ID (bits 15:8)
* 5 0x01 Command ID (bits 7:0) * 5 0x01 Command ID (bits 7:0)
* 6 0xNN Command result status. Possible values are: * 6 0xNN Command result status. Possible values are:
*  0x00 = Success (OK) * 0x00 = Success (OK)
* 0x01 = ERROR: Unknown database category * 0x01 = ERROR: Unknown database category
*  0x02 = ERROR: Command failed * 0x02 = ERROR: Command failed
* 0x03 = ERROR: Out of resources * 0x03 = ERROR: Out of resources
* 0x04 = ERROR: Bad parameter * 0x04 = ERROR: Bad parameter
* 0x05 = ERROR: Unknown ID * 0x05 = ERROR: Unknown ID
* 0x06 = Reserved * 0x06 = Reserved
* 0x07 = Accessory not authenticated * 0x07 = Accessory not authenticated
*  0x08 - 0xFF = Reserved * 0x08 - 0xFF = Reserved
* 7 0xNN The ID of the command being acknowledged (bits 15:8). * 7 0xNN The ID of the command being acknowledged (bits 15:8).
* 8 0xNN The ID of the command being acknowledged (bits 7:0). * 8 0xNN The ID of the command being acknowledged (bits 7:0).
* 9 0xNN Telegram payload checksum byte * 9 0xNN Telegram payload checksum byte
@ -429,7 +429,7 @@ void iap_handlepkt_mode4(const unsigned int len, const unsigned char *buf)
/* The following is the description for the Apple Firmware /* The following is the description for the Apple Firmware
* *
* Requests the current iPod audiobook speed state. The iPod * Requests the current iPod audiobook speed state. The iPod
* responds with the “Command 0x000A: ReturnAudiobookSpeed” * responds with the “Command 0x000A: ReturnAudiobookSpeed”
* telegram indicating the current audiobook speed. * telegram indicating the current audiobook speed.
* *
* Byte Value Meaning * Byte Value Meaning
@ -1283,7 +1283,7 @@ void iap_handlepkt_mode4(const unsigned int len, const unsigned char *buf)
* GetNumberCategorizedDBRecords must be called to initialize the * GetNumberCategorizedDBRecords must be called to initialize the
* category count before selecting a database record using Command * category count before selecting a database record using Command
* 0x0017: SelectDBRecord or Command 0x0038: SelectSortDBRecord * 0x0017: SelectDBRecord or Command 0x0038: SelectSortDBRecord
* commands. A category’s record count can change based on the prior * commands. A category’s record count can change based on the prior
* categories selected and the database hierarchy. The accessory * categories selected and the database hierarchy. The accessory
* is expected to call GetNumberCategorizedDBRecords in order to * is expected to call GetNumberCategorizedDBRecords in order to
* get the valid range of category entries before selecting a * get the valid range of category entries before selecting a
@ -2214,7 +2214,7 @@ void iap_handlepkt_mode4(const unsigned int len, const unsigned char *buf)
* 0x00 Shuffle off * 0x00 Shuffle off
* 0x01 Shuffle tracks * 0x01 Shuffle tracks
* 0x02 Shuffle albums * 0x02 Shuffle albums
* 0x03 – 0xFF Reserved * 0x03 – 0xFF Reserved
* *
*/ */
{ {
@ -2459,7 +2459,7 @@ void iap_handlepkt_mode4(const unsigned int len, const unsigned char *buf)
* GetColorDisplayImageLimits telegram to obtain the iPod color * GetColorDisplayImageLimits telegram to obtain the iPod color
* display width,height,and pixel formats. The color display * display width,height,and pixel formats. The color display
* information is returned in the Command 0x003A: * information is returned in the Command 0x003A:
* ReturnColorDisplayImageLimits” telegram. * ReturnColorDisplayImageLimits” telegram.
* To set a display image, the device must successfully send * To set a display image, the device must successfully send
* SetDisplayImage descriptor and data telegrams to the iPod. The * SetDisplayImage descriptor and data telegrams to the iPod. The
* SetDisplayImage descriptor telegram (telegram index 0x0000) must * SetDisplayImage descriptor telegram (telegram index 0x0000) must
@ -2486,10 +2486,10 @@ void iap_handlepkt_mode4(const unsigned int len, const unsigned char *buf)
* classic and iPod 3G nano apply this restriction to both USB and * classic and iPod 3G nano apply this restriction to both USB and
* UART transports. Calls made to SetDisplayImage more frequently * UART transports. Calls made to SetDisplayImage more frequently
* than every 15 seconds will return a successful ACK command, but * than every 15 seconds will return a successful ACK command, but
* the bitmap will not be displayed on the iPod’s screen. Hence use * the bitmap will not be displayed on the iPod’s screen. Hence use
* of the SetDisplayImage command should be limited to drawing one * of the SetDisplayImage command should be limited to drawing one
* bitmap image per accessory connect. The iPod touch will accept * bitmap image per accessory connect. The iPod touch will accept
* the SetDisplayImage command but will not draw it on the iPod’s * the SetDisplayImage command but will not draw it on the iPod’s
* screen. * screen.
* *
* Below shows the format of a descriptor telegram. This example * Below shows the format of a descriptor telegram. This example
@ -2527,7 +2527,7 @@ void iap_handlepkt_mode4(const unsigned int len, const unsigned char *buf)
* 16 0xNN Row size (stride) in bytes (bits 23:16) * 16 0xNN Row size (stride) in bytes (bits 23:16)
* 17 0xNN Row size (stride) in bytes (bits 15:8) * 17 0xNN Row size (stride) in bytes (bits 15:8)
* 18 0xNN Row size (stride) in bytes (bits 7:0) * 18 0xNN Row size (stride) in bytes (bits 7:0)
* 19–N 0xNN Display image pixel data * 19–N 0xNN Display image pixel data
* NN 0xNN Telegram payload checksum byte * NN 0xNN Telegram payload checksum byte
* *
* SetDisplayImage data telegram (telegram index = 0x0001 - 0xNNNN) * SetDisplayImage data telegram (telegram index = 0x0001 - 0xNNNN)
@ -2547,7 +2547,7 @@ void iap_handlepkt_mode4(const unsigned int len, const unsigned char *buf)
* remaining n-1 telegrams are simply data telegrams, * remaining n-1 telegrams are simply data telegrams,
* where n is determined by the size of the image. * where n is determined by the size of the image.
* 9 0xNN Descriptor telegram index (bits 7:0) * 9 0xNN Descriptor telegram index (bits 7:0)
* 10–N 0xNN Display image pixel data * 10–N 0xNN Display image pixel data
* NN 0xNN Telegram payload checksum byte * NN 0xNN Telegram payload checksum byte
* *
* Note: A known issue causes SetDisplayImage data telegram * Note: A known issue causes SetDisplayImage data telegram
@ -2894,8 +2894,8 @@ void iap_handlepkt_mode4(const unsigned int len, const unsigned char *buf)
* GetNumberCategorizedDBRecords in step 4. * GetNumberCategorizedDBRecords in step 4.
* *
* The sort order of artist names ignores certain articles such * The sort order of artist names ignores certain articles such
* that the artist “The Doors” is sorted under the letter ‘D’ and * that the artist “The Doors” is sorted under the letter ‘D’ and
* not ‘T’; this matches the behavior of iTunes. The sort order is * not ‘T’; this matches the behavior of iTunes. The sort order is
* different depending on the language setting used in the iPod. * different depending on the language setting used in the iPod.
* The list of ignored articles may change in the future without * The list of ignored articles may change in the future without
* notice. * notice.

28
apps/plugins/doom/d_deh.c
View file

@ -1696,26 +1696,26 @@ uint_64_t getConvertedDEHBits(uint_64_t bits) {
MF_JUSTHIT, // 6 In pain. Will try to attack right back after being hit MF_JUSTHIT, // 6 In pain. Will try to attack right back after being hit
MF_JUSTATTACKED, // 7 Steps before attack. Will take at least one step before attacking MF_JUSTATTACKED, // 7 Steps before attack. Will take at least one step before attacking
MF_SPAWNCEILING, // 8 Hangs from ceiling. When the level starts, this thing will be at ceiling height. MF_SPAWNCEILING, // 8 Hangs from ceiling. When the level starts, this thing will be at ceiling height.
MF_NOGRAVITY, // 9 No gravity – Gravity does not affect this thing MF_NOGRAVITY, // 9 No gravity – Gravity does not affect this thing
MF_DROPOFF, // 10 Travels over cliffs – Monsters normally do not walk off ledges/steps they could not walk up. With this set they can walk off any height of cliff. Usually only used for flying monsters. MF_DROPOFF, // 10 Travels over cliffs – Monsters normally do not walk off ledges/steps they could not walk up. With this set they can walk off any height of cliff. Usually only used for flying monsters.
MF_PICKUP, // 11 Pick up items – The thing can pick up gettable items. MF_PICKUP, // 11 Pick up items – The thing can pick up gettable items.
MF_NOCLIP, // 12 No clipping - Thing can walk through walls. MF_NOCLIP, // 12 No clipping - Thing can walk through walls.
MF_SLIDE, // 13 Slides along walls – Keep info about sliding along walls (don’t really know much about this one). MF_SLIDE, // 13 Slides along walls – Keep info about sliding along walls (don’t really know much about this one).
MF_FLOAT, // 14 Floating – Thing can move to any height MF_FLOAT, // 14 Floating – Thing can move to any height
MF_TELEPORT, // 15 Semi no clipping – Don’t cross lines or look at teleport heights. (don’t really know much about this one either). MF_TELEPORT, // 15 Semi no clipping – Don’t cross lines or look at teleport heights. (don’t really know much about this one either).
MF_MISSILE, // 16 Projectiles – Behaves like a projectile, explodes when hitting something that blocks movement MF_MISSILE, // 16 Projectiles – Behaves like a projectile, explodes when hitting something that blocks movement
MF_DROPPED, // 17 Disappearing weapon – Dropped, not spawned (like an ammo clip) I have not had much success in using this one. MF_DROPPED, // 17 Disappearing weapon – Dropped, not spawned (like an ammo clip) I have not had much success in using this one.
MF_SHADOW, // 18 Partial invisibility – Drawn like a spectre. MF_SHADOW, // 18 Partial invisibility – Drawn like a spectre.
MF_NOBLOOD, // 19 Puffs (vs. bleeds) – If hit will spawn bullet puffs instead of blood splats. MF_NOBLOOD, // 19 Puffs (vs. bleeds) – If hit will spawn bullet puffs instead of blood splats.
MF_CORPSE, // 20 Sliding helpless – Will slide down steps when dead. MF_CORPSE, // 20 Sliding helpless – Will slide down steps when dead.
MF_INFLOAT, // 21 No auto levelling - float but not to target height (?) MF_INFLOAT, // 21 No auto levelling - float but not to target height (?)
MF_COUNTKILL, // 22 Affects kill % – counted as a killable enemy and affects percentage kills on level summary. MF_COUNTKILL, // 22 Affects kill % – counted as a killable enemy and affects percentage kills on level summary.
MF_COUNTITEM, // 23 Affects item % –affects percentage items gathered on level summary. MF_COUNTITEM, // 23 Affects item % –affects percentage items gathered on level summary.
MF_SKULLFLY, // 24 Running - special handling for flying skulls. MF_SKULLFLY, // 24 Running - special handling for flying skulls.
MF_NOTDMATCH, // 25 Not in deathmatch - do not spawn in deathmatch (like keys) MF_NOTDMATCH, // 25 Not in deathmatch - do not spawn in deathmatch (like keys)
MF_TRANSLATION1, // 26 Color 1 (grey / red) MF_TRANSLATION1, // 26 Color 1 (grey / red)
MF_TRANSLATION2, // 27 Color 2 (brown / red) MF_TRANSLATION2, // 27 Color 2 (brown / red)
MF_TRANSLATION, // 28 and 29 allow the green colours in a thing’s graphics to be remapped to a different colour like the players uniforms in multiplayer games. Leaving all the bits alone, the thing stays green. Setting 26 it becomes grey. Setting 27 it becomes brown. Setting both 26 and 27 it becomes red. MF_TRANSLATION, // 28 and 29 allow the green colours in a thing’s graphics to be remapped to a different colour like the players uniforms in multiplayer games. Leaving all the bits alone, the thing stays green. Setting 26 it becomes grey. Setting 27 it becomes brown. Setting both 26 and 27 it becomes red.
MF_TRANSLATION, MF_TRANSLATION,
0, 0,
0 0

2
apps/plugins/logo.c
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) 2005 Jonas H<EFBFBD>gqvist * Copyright (C) 2005 Jonas Häggqvist
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

2
apps/plugins/pdbox/PDa/src/d_resample.c
View file

@ -7,7 +7,7 @@
* mfg.gfd.uil * mfg.gfd.uil
* IOhannes * IOhannes
* *
* 2509:forum::für::umläute:2001 * 2509:forum::für::umläute:2001
*/ */

2
apps/plugins/pdbox/PDa/src/g_canvas.c
View file

@ -14,7 +14,7 @@ to be different but are now unified except for some fossilized names.) */
* changed the canvas_restore, so that it might accept $args as well * changed the canvas_restore, so that it might accept $args as well
* (like "pd $0_test") * (like "pd $0_test")
* so you can make multiple & distinguishable templates * so you can make multiple & distinguishable templates
* 1511:forum::für::umläute:2001 * 1511:forum::für::umläute:2001
* changes marked with IOhannes * changes marked with IOhannes
*/ */

2
apps/plugins/pdbox/PDa/src/g_scalar.c
View file

@ -14,7 +14,7 @@ control their appearances by adding stuff to draw.
/* IOhannes : /* IOhannes :
* changed the canvas_restore, so that it might accept $args as well (like "pd $0_test") * changed the canvas_restore, so that it might accept $args as well (like "pd $0_test")
* so you can make multiple & distinguishable templates * so you can make multiple & distinguishable templates
* 1511:forum::für::umläute:2001 * 1511:forum::für::umläute:2001
* changes marked with IOhannes * changes marked with IOhannes
* added Krzysztof Czajas fix to avoid crashing... * added Krzysztof Czajas fix to avoid crashing...
*/ */

2
apps/plugins/pdbox/PDa/src/m_binbuf.c
View file

@ -6,7 +6,7 @@
/* IOhannes : /* IOhannes :
* changed the canvas_restore in "g_canvas.c", so that it might accept $args as well (like "pd $0_test") * changed the canvas_restore in "g_canvas.c", so that it might accept $args as well (like "pd $0_test")
* so you can make multiple & distinguishable templates * so you can make multiple & distinguishable templates
* 1511:forum::für::umläute:2001 * 1511:forum::für::umläute:2001
* change marked with IOhannes * change marked with IOhannes
*/ */

6
apps/plugins/sdl/SDL_image/IMG_tga.c
View file

@ -38,9 +38,9 @@
* Supports: Reading 8, 15, 16, 24 and 32bpp images, with alpha or colourkey, * Supports: Reading 8, 15, 16, 24 and 32bpp images, with alpha or colourkey,
* uncompressed or RLE encoded. * uncompressed or RLE encoded.
* *
* 2000-06-10 Mattias Engdegård <f91-men@nada.kth.se>: initial version * 2000-06-10 Mattias Engdegård <f91-men@nada.kth.se>: initial version
* 2000-06-26 Mattias Engdegård <f91-men@nada.kth.se>: read greyscale TGAs * 2000-06-26 Mattias Engdegård <f91-men@nada.kth.se>: read greyscale TGAs
* 2000-08-09 Mattias Engdegård <f91-men@nada.kth.se>: alpha inversion removed * 2000-08-09 Mattias Engdegård <f91-men@nada.kth.se>: alpha inversion removed
*/ */
struct TGAheader { struct TGAheader {

2
apps/plugins/sdl/SDL_mixer/load_aiff.c
View file

@ -23,7 +23,7 @@
externally-callable function is Mix_LoadAIFF_RW(), which is meant to externally-callable function is Mix_LoadAIFF_RW(), which is meant to
act as identically to SDL_LoadWAV_RW() as possible. act as identically to SDL_LoadWAV_RW() as possible.
This file by Torbjörn Andersson (torbjorn.andersson@eurotime.se) This file by Torbjörn Andersson (torbjorn.andersson@eurotime.se)
8SVX file support added by Marc Le Douarain (mavati@club-internet.fr) 8SVX file support added by Marc Le Douarain (mavati@club-internet.fr)
in december 2002. in december 2002.
*/ */

2
apps/plugins/sdl/SDL_mixer/load_aiff.h
View file

@ -21,7 +21,7 @@
externally-callable function is Mix_LoadAIFF_RW(), which is meant to externally-callable function is Mix_LoadAIFF_RW(), which is meant to
act as identically to SDL_LoadWAV_RW() as possible. act as identically to SDL_LoadWAV_RW() as possible.
This file by Torbjörn Andersson (torbjorn.andersson@eurotime.se) This file by Torbjörn Andersson (torbjorn.andersson@eurotime.se)
*/ */
/* $Id$ */ /* $Id$ */

10
apps/plugins/sdl/progs/duke3d/Engine/src/build.h
View file

@ -219,9 +219,13 @@ SPRITE VARIABLES:
EXTERN short nextspritesect[MAXSPRITES], nextspritestat[MAXSPRITES]; EXTERN short nextspritesect[MAXSPRITES], nextspritestat[MAXSPRITES];
Example: if the linked lists look like the following: Example: if the linked lists look like the following:
ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿ ┌──────────────────────────────────────────────────────────────┐
? Sector lists: Status lists: ? ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´ │ Sector lists: Status lists: │
? Sector0: 4, 5, 8 Status0: 2, 0, 8 ? ? Sector1: 16, 2, 0, 7 Status1: 4, 5, 16, 7, 3, 9 ? ? Sector2: 3, 9 ? ÀÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ ├──────────────────────────────────────────────────────────────┤
│ Sector0: 4, 5, 8 Status0: 2, 0, 8 │
│ Sector1: 16, 2, 0, 7 Status1: 4, 5, 16, 7, 3, 9 │
│ Sector2: 3, 9 │
└──────────────────────────────────────────────────────────────┘
Notice that each number listed above is shown exactly once on both the Notice that each number listed above is shown exactly once on both the
left and right side. This is because any sprite that exists must left and right side. This is because any sprite that exists must
be in some sector, and must have some kind of status that you define. be in some sector, and must have some kind of status that you define.

6
apps/plugins/sdl/progs/duke3d/Engine/src/engine.c
View file

@ -4742,9 +4742,9 @@ static void ceilspritehline (int32_t x2, int32_t y)
int32_t x1, v, bx, by; int32_t x1, v, bx, by;
/* /*
* x = x1 + (x2-x1)t + (y1-y2)u ³ x = 160v * x = x1 + (x2-x1)t + (y1-y2)u │ x = 160v
* y = y1 + (y2-y1)t + (x2-x1)u ³ y = (scrx-160)v * y = y1 + (y2-y1)t + (x2-x1)u │ y = (scrx-160)v
* z = z1 = z2 ³ z = posz + (scry-horiz)v * z = z1 = z2 │ z = posz + (scry-horiz)v
*/ */
x1 = lastx[y]; x1 = lastx[y];

14
apps/plugins/sdl/progs/duke3d/Game/src/audiolib/awe32.c
View file

@ -333,10 +333,10 @@ static int InitMPU
} }
*/ */
/*ﾕﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍｸ*/ /*╒════════════════════════════════════════════════════════════════════════╕*/
/*ｳ ShutdownMPU ｳ*/ /*│ ShutdownMPU │*/
/*ｳ Cleans up Sound Blaster to normal state. ｳ*/ /*│ Cleans up Sound Blaster to normal state. │*/
/*ﾔﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍｾ*/ /*╘════════════════════════════════════════════════════════════════════════╛*/
static void ShutdownMPU static void ShutdownMPU
( (
@ -362,9 +362,9 @@ static void ShutdownMPU
} }
/*ﾕﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍｸ*/ /*╒════════════════════════════════════════════════════════════════════════╕*/
/*ｳ LoadSBK ｳ*/ /*│ LoadSBK │*/
/*ﾔﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍﾍｾ*/ /*╘════════════════════════════════════════════════════════════════════════╛*/
static void LoadSBK static void LoadSBK
( (

2
apps/plugins/sdl/progs/wolf3d/wl_play.c
View file

@ -213,7 +213,7 @@ int songs[] = {
XFUNKIE_MUS, XFUNKIE_MUS,
XDEATH_MUS, XDEATH_MUS,
XGETYOU_MUS, // DON'T KNOW XGETYOU_MUS, // DON'T KNOW
ULTIMATE_MUS, // Trans Gr”sse ULTIMATE_MUS, // Trans Grösse
DUNGEON_MUS, DUNGEON_MUS,
GOINGAFT_MUS, GOINGAFT_MUS,

8
apps/plugins/sdl/src/audio/SDL_mixer_MMX.c
View file

@ -69,7 +69,7 @@ void SDL_MixAudio_MMX_S16(char* dst,char* src,unsigned int size,int volume)
" movq 8(%1),%%mm4\n" /* mm4 = e|f|g|h */ " movq 8(%1),%%mm4\n" /* mm4 = e|f|g|h */
/* pré charger le buffer dst dans mm7 */ /* pré charger le buffer dst dans mm7 */
" movq (%0),%%mm7\n" /* mm7 = dst[0] */ " movq (%0),%%mm7\n" /* mm7 = dst[0] */
/* multiplier par le volume */ /* multiplier par le volume */
@ -92,7 +92,7 @@ void SDL_MixAudio_MMX_S16(char* dst,char* src,unsigned int size,int volume)
" punpcklwd %%mm5,%%mm6\n" /* mm6 = g*v|h*v */ " punpcklwd %%mm5,%%mm6\n" /* mm6 = g*v|h*v */
/* pré charger le buffer dst dans mm5 */ /* pré charger le buffer dst dans mm5 */
" movq 8(%0),%%mm5\n" /* mm5 = dst[1] */ " movq 8(%0),%%mm5\n" /* mm5 = dst[1] */
/* diviser par 128 */ /* diviser par 128 */
@ -103,13 +103,13 @@ void SDL_MixAudio_MMX_S16(char* dst,char* src,unsigned int size,int volume)
" psrad $7,%%mm4\n" /* mm4 = e*v/128|f*v/128 */ " psrad $7,%%mm4\n" /* mm4 = e*v/128|f*v/128 */
/* mm1 = le sample avec le volume modifié */ /* mm1 = le sample avec le volume modifié */
" packssdw %%mm1,%%mm3\n" /* mm3 = s(a*v|b*v|c*v|d*v) */ " packssdw %%mm1,%%mm3\n" /* mm3 = s(a*v|b*v|c*v|d*v) */
" psrad $7,%%mm6\n" /* mm6= g*v/128|h*v/128 */ " psrad $7,%%mm6\n" /* mm6= g*v/128|h*v/128 */
" paddsw %%mm7,%%mm3\n" /* mm3 = adjust_volume(src)+dst */ " paddsw %%mm7,%%mm3\n" /* mm3 = adjust_volume(src)+dst */
/* mm4 = le sample avec le volume modifié */ /* mm4 = le sample avec le volume modifié */
" packssdw %%mm4,%%mm6\n" /* mm6 = s(e*v|f*v|g*v|h*v) */ " packssdw %%mm4,%%mm6\n" /* mm6 = s(e*v|f*v|g*v|h*v) */
" movq %%mm3,(%0)\n" " movq %%mm3,(%0)\n"

2
apps/plugins/sdl/src/video/SDL_RLEaccel.c
View file

@ -26,7 +26,7 @@
* *
* Original version by Sam Lantinga * Original version by Sam Lantinga
* *
* Mattias Engdegård (Yorick): Rewrite. New encoding format, encoder and * Mattias Engdegård (Yorick): Rewrite. New encoding format, encoder and
* decoder. Added per-surface alpha blitter. Added per-pixel alpha * decoder. Added per-surface alpha blitter. Added per-pixel alpha
* format, encoder and blitter. * format, encoder and blitter.
* *

2
apps/plugins/sdl/src/video/default_cursor.h
View file

@ -28,7 +28,7 @@
#define DEFAULT_CHOTX 0 #define DEFAULT_CHOTX 0
#define DEFAULT_CHOTY 0 #define DEFAULT_CHOTY 0
/* Added a real MacOS cursor, at the request of Luc-Olivier de Charrière */ /* Added a real MacOS cursor, at the request of Luc-Olivier de Charrière */
#define USE_MACOS_CURSOR #define USE_MACOS_CURSOR
#ifdef USE_MACOS_CURSOR #ifdef USE_MACOS_CURSOR

6
firmware/common/vuprintf.c
View file

@ -79,8 +79,8 @@
#define FMT_RADIX_s 0x020 /* string (%s) */ #define FMT_RADIX_s 0x020 /* string (%s) */
#define FMT_RADIX_u 0x040 /* unsigned integer type, decimal (%u) */ #define FMT_RADIX_u 0x040 /* unsigned integer type, decimal (%u) */
#define FMT_RADIX_x 0x080 /* unsigned integer type, hex (%x %X) */ #define FMT_RADIX_x 0x080 /* unsigned integer type, hex (%x %X) */
#define FMT_RADIX_a 0x100 /* hex floating point "[-]0xh.hhhhp±d" */ #define FMT_RADIX_a 0x100 /* hex floating point "[-]0xh.hhhhp±d" */
#define FMT_RADIX_e 0x200 /* floating point with exponent "[-]d.ddde±dd" */ #define FMT_RADIX_e 0x200 /* floating point with exponent "[-]d.ddde±dd" */
#define FMT_RADIX_f 0x400 /* floating point "[-]ddd.ddd" */ #define FMT_RADIX_f 0x400 /* floating point "[-]ddd.ddd" */
#define FMT_RADIX_g 0x800 /* floating point exponent or decimal depending #define FMT_RADIX_g 0x800 /* floating point exponent or decimal depending
upon value and precision */ upon value and precision */
@ -866,7 +866,7 @@ static int format_double_radix(double f,
} }
if (explen) { if (explen) {
/* build exponent string: 'e±dd' */ /* build exponent string: 'e±dd' */
char *p = fmt_buf->bufend; char *p = fmt_buf->bufend;
int signchar = '+'; int signchar = '+';

2
firmware/export/jz4740.h
View file

@ -1421,7 +1421,7 @@
#define SSI_CR1_MULTS (1 << 22) #define SSI_CR1_MULTS (1 << 22)
#define SSI_CR1_FMAT_BIT 20 #define SSI_CR1_FMAT_BIT 20
#define SSI_CR1_FMAT_MASK (0x3 << SSI_CR1_FMAT_BIT) #define SSI_CR1_FMAT_MASK (0x3 << SSI_CR1_FMAT_BIT)
#define SSI_CR1_FMAT_SPI (0 << SSI_CR1_FMAT_BIT) /* Motorola¡¯s SPI format */ #define SSI_CR1_FMAT_SPI (0 << SSI_CR1_FMAT_BIT) /* Motorola’s SPI format */
#define SSI_CR1_FMAT_SSP (1 << SSI_CR1_FMAT_BIT) /* TI's SSP format */ #define SSI_CR1_FMAT_SSP (1 << SSI_CR1_FMAT_BIT) /* TI's SSP format */
#define SSI_CR1_FMAT_MW1 (2 << SSI_CR1_FMAT_BIT) /* National Microwire 1 format */ #define SSI_CR1_FMAT_MW1 (2 << SSI_CR1_FMAT_BIT) /* National Microwire 1 format */
#define SSI_CR1_FMAT_MW2 (3 << SSI_CR1_FMAT_BIT) /* National Microwire 2 format */ #define SSI_CR1_FMAT_MW2 (3 << SSI_CR1_FMAT_BIT) /* National Microwire 2 format */

2
firmware/export/jz4760b.h
View file

@ -7944,7 +7944,7 @@ do { \
#define SSI_CR1_MULTS (1 << 22) #define SSI_CR1_MULTS (1 << 22)
#define SSI_CR1_FMAT_BIT 20 #define SSI_CR1_FMAT_BIT 20
#define SSI_CR1_FMAT_MASK (0x3 << SSI_CR1_FMAT_BIT) #define SSI_CR1_FMAT_MASK (0x3 << SSI_CR1_FMAT_BIT)
#define SSI_CR1_FMAT_SPI (0 << SSI_CR1_FMAT_BIT) /* Motorola¡¯s SPI format */ #define SSI_CR1_FMAT_SPI (0 << SSI_CR1_FMAT_BIT) /* Motorola’s SPI format */
#define SSI_CR1_FMAT_SSP (1 << SSI_CR1_FMAT_BIT) /* TI's SSP format */ #define SSI_CR1_FMAT_SSP (1 << SSI_CR1_FMAT_BIT) /* TI's SSP format */
#define SSI_CR1_FMAT_MW1 (2 << SSI_CR1_FMAT_BIT) /* National Microwire 1 format */ #define SSI_CR1_FMAT_MW1 (2 << SSI_CR1_FMAT_BIT) /* National Microwire 1 format */
#define SSI_CR1_FMAT_MW2 (3 << SSI_CR1_FMAT_BIT) /* National Microwire 2 format */ #define SSI_CR1_FMAT_MW2 (3 << SSI_CR1_FMAT_BIT) /* National Microwire 2 format */

2
firmware/target/arm/as3525/kernel-as3525.c
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright Š 2008 Rafaël Carré * Copyright © 2008 Rafaël Carré
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

2
firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c
View file

@ -109,7 +109,7 @@ int battery_adc_temp(void)
* R[ohms] = E/I = E[volts] / 0.00002[A] (Thermistor bias current source) * R[ohms] = E/I = E[volts] / 0.00002[A] (Thermistor bias current source)
* *
* Steinhart-Hart thermistor equation: * Steinhart-Hart thermistor equation:
* [A + B*ln(R) + D*ln^3(R)] = 1 / T[°K] * [A + B*ln(R) + D*ln^3(R)] = 1 / T[°K]
* *
* Coeffients that fit experimental data (one thermistor so far, one run): * Coeffients that fit experimental data (one thermistor so far, one run):
* A = 0.0013002631685462800 * A = 0.0013002631685462800

2
firmware/target/arm/s3c2440/dma-target.h
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright © 2009 by Bob Cousins * Copyright © 2009 by Bob Cousins
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

2
firmware/target/arm/s5l8700/kernel-s5l8700.c
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright © 2009 Bertrik Sikken * Copyright © 2009 Bertrik Sikken
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

6
lib/rbcodec/codecs/libgme/ym2612_emu.c
View file

@ -10,7 +10,7 @@
#include "ym2612_emu.h" #include "ym2612_emu.h"
/* Copyright (C) 2002 Stéphane Dallongeville (gens AT consolemul.com) */ /* Copyright (C) 2002 Stéphane Dallongeville (gens AT consolemul.com) */
/* Copyright (C) 2004-2007 Shay Green. This module is free software; you /* Copyright (C) 2004-2007 Shay Green. This module is free software; you
can redistribute it and/or modify it under the terms of the GNU Lesser can redistribute it and/or modify it under the terms of the GNU Lesser
General Public License as published by the Free Software Foundation; either General Public License as published by the Free Software Foundation; either
@ -1307,7 +1307,7 @@ static void impl_run( struct Ym2612_Impl* impl, int pair_count, short out [] )
if ( impl->YM2612.Mode & 3 ) if ( impl->YM2612.Mode & 3 )
run_timer( impl, pair_count ); run_timer( impl, pair_count );
// Mise à jour des pas des compteurs-frequences s'ils ont ete modifies // Mise à jour des pas des compteurs-frequences s'ils ont ete modifies
int chi; int chi;
for ( chi = 0; chi < ym2612_channel_count; chi++ ) for ( chi = 0; chi < ym2612_channel_count; chi++ )
@ -1331,7 +1331,7 @@ static void impl_run( struct Ym2612_Impl* impl, int pair_count, short out [] )
int ksr = ch->KC [i2] >> sl->KSR_S; // keycode attenuation int ksr = ch->KC [i2] >> sl->KSR_S; // keycode attenuation
sl->Finc = (finc + sl->DT [ch->KC [i2]]) * sl->MUL; sl->Finc = (finc + sl->DT [ch->KC [i2]]) * sl->MUL;
if (sl->KSR != ksr) // si le KSR a change alors if (sl->KSR != ksr) // si le KSR a change alors
{ // les differents taux pour l'enveloppe sont mis à jour { // les differents taux pour l'enveloppe sont mis à jour
sl->KSR = ksr; sl->KSR = ksr;
sl->EincA = sl->AR [ksr]; sl->EincA = sl->AR [ksr];

26
lib/rbcodec/codecs/libgme/ym2612_emu.h
View file

@ -24,9 +24,9 @@ struct slot_t
int MUL; // parametre "multiple de frequence" int MUL; // parametre "multiple de frequence"
int TL; // Total Level = volume lorsque l'enveloppe est au plus haut int TL; // Total Level = volume lorsque l'enveloppe est au plus haut
int TLL; // Total Level ajusted int TLL; // Total Level ajusted
int SLL; // Sustin Level (ajusted) = volume où l'enveloppe termine sa premiere phase de regression int SLL; // Sustin Level (ajusted) = volume où l'enveloppe termine sa premiere phase de regression
int KSR_S; // Key Scale Rate Shift = facteur de prise en compte du KSL dans la variations de l'enveloppe int KSR_S; // Key Scale Rate Shift = facteur de prise en compte du KSL dans la variations de l'enveloppe
int KSR; // Key Scale Rate = cette valeur est calculee par rapport à la frequence actuelle, elle va influer int KSR; // Key Scale Rate = cette valeur est calculee par rapport à la frequence actuelle, elle va influer
// sur les differents parametres de l'enveloppe comme l'attaque, le decay ... comme dans la realite ! // sur les differents parametres de l'enveloppe comme l'attaque, le decay ... comme dans la realite !
int SEG; // Type enveloppe SSG int SEG; // Type enveloppe SSG
int env_xor; int env_xor;
@ -38,24 +38,24 @@ struct slot_t
const int *RR; // Release Rate (table pointeur) = Taux pour le rel'chement (RR [KSR]) const int *RR; // Release Rate (table pointeur) = Taux pour le rel'chement (RR [KSR])
int Fcnt; // Frequency Count = compteur-frequence pour determiner l'amplitude actuelle (SIN [Finc >> 16]) int Fcnt; // Frequency Count = compteur-frequence pour determiner l'amplitude actuelle (SIN [Finc >> 16])
int Finc; // frequency step = pas d'incrementation du compteur-frequence int Finc; // frequency step = pas d'incrementation du compteur-frequence
// plus le pas est grand, plus la frequence est aïgu (ou haute) // plus le pas est grand, plus la frequence est aïgu (ou haute)
int Ecurp; // Envelope current phase = cette variable permet de savoir dans quelle phase int Ecurp; // Envelope current phase = cette variable permet de savoir dans quelle phase
// de l'enveloppe on se trouve, par exemple phase d'attaque ou phase de maintenue ... // de l'enveloppe on se trouve, par exemple phase d'attaque ou phase de maintenue ...
// en fonction de la valeur de cette variable, on va appeler une fonction permettant // en fonction de la valeur de cette variable, on va appeler une fonction permettant
// de mettre à jour l'enveloppe courante. // de mettre à jour l'enveloppe courante.
int Ecnt; // Envelope counter = le compteur-enveloppe permet de savoir où l'on se trouve dans l'enveloppe int Ecnt; // Envelope counter = le compteur-enveloppe permet de savoir où l'on se trouve dans l'enveloppe
int Einc; // Envelope step courant int Einc; // Envelope step courant
int Ecmp; // Envelope counter limite pour la prochaine phase int Ecmp; // Envelope counter limite pour la prochaine phase
int EincA; // Envelope step for Attack = pas d'incrementation du compteur durant la phase d'attaque int EincA; // Envelope step for Attack = pas d'incrementation du compteur durant la phase d'attaque
// cette valeur est egal à AR [KSR] // cette valeur est egal à AR [KSR]
int EincD; // Envelope step for Decay = pas d'incrementation du compteur durant la phase de regression int EincD; // Envelope step for Decay = pas d'incrementation du compteur durant la phase de regression
// cette valeur est egal à DR [KSR] // cette valeur est egal à DR [KSR]
int EincS; // Envelope step for Sustain = pas d'incrementation du compteur durant la phase de maintenue int EincS; // Envelope step for Sustain = pas d'incrementation du compteur durant la phase de maintenue
// cette valeur est egal à SR [KSR] // cette valeur est egal à SR [KSR]
int EincR; // Envelope step for Release = pas d'incrementation du compteur durant la phase de rel'chement int EincR; // Envelope step for Release = pas d'incrementation du compteur durant la phase de rel'chement
// cette valeur est egal à RR [KSR] // cette valeur est egal à RR [KSR]
int *OUTp; // pointeur of SLOT output = pointeur permettant de connecter la sortie de ce slot à l'entree int *OUTp; // pointeur of SLOT output = pointeur permettant de connecter la sortie de ce slot à l'entree
// d'un autre ou carrement à la sortie de la voie // d'un autre ou carrement à la sortie de la voie
int INd; // input data of the slot = donnees en entree du slot int INd; // input data of the slot = donnees en entree du slot
int ChgEnM; // Change envelop mask. int ChgEnM; // Change envelop mask.
int AMS; // AMS depth level of this SLOT = degre de modulation de l'amplitude par le LFO int AMS; // AMS depth level of this SLOT = degre de modulation de l'amplitude par le LFO
@ -82,10 +82,10 @@ struct state_t
{ {
int TimerBase; // TimerBase calculation int TimerBase; // TimerBase calculation
int Status; // YM2612 Status (timer overflow) int Status; // YM2612 Status (timer overflow)
int TimerA; // timerA limit = valeur jusqu'à laquelle le timer A doit compter int TimerA; // timerA limit = valeur jusqu'à laquelle le timer A doit compter
int TimerAL; int TimerAL;
int TimerAcnt; // timerA counter = valeur courante du Timer A int TimerAcnt; // timerA counter = valeur courante du Timer A
int TimerB; // timerB limit = valeur jusqu'à laquelle le timer B doit compter int TimerB; // timerB limit = valeur jusqu'à laquelle le timer B doit compter
int TimerBL; int TimerBL;
int TimerBcnt; // timerB counter = valeur courante du Timer B int TimerBcnt; // timerB counter = valeur courante du Timer B
int Mode; // Mode actuel des voie 3 et 6 (normal / special) int Mode; // Mode actuel des voie 3 et 6 (normal / special)

2
lib/rbcodec/dsp/tdspeed.h
View file

@ -8,7 +8,7 @@
* $Id$ * $Id$
* *
* Copyright (C) 2006 by Nicolas Pitre <nico@cam.org> * Copyright (C) 2006 by Nicolas Pitre <nico@cam.org>
* Copyright (C) 2006-2007 by Stéphane Doyon <s.doyon@videotron.ca> * Copyright (C) 2006-2007 by Stéphane Doyon <s.doyon@videotron.ca>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

2
lib/rbcodec/metadata/id3tags.c
View file

@ -20,7 +20,7 @@
****************************************************************************/ ****************************************************************************/
/* /*
* Parts of this code has been stolen from the Ample project and was written * Parts of this code has been stolen from the Ample project and was written
* by David H<EFBFBD>deman. It has since been extended and enhanced pretty much by * by David Härdeman. It has since been extended and enhanced pretty much by
* all sorts of friendly Rockbox people. * all sorts of friendly Rockbox people.
* *
*/ */

2
lib/rbcodec/metadata/mp3.c
View file

@ -20,7 +20,7 @@
****************************************************************************/ ****************************************************************************/
/* /*
* Parts of this code has been stolen from the Ample project and was written * Parts of this code has been stolen from the Ample project and was written
* by David H<EFBFBD>deman. It has since been extended and enhanced pretty much by * by David Härdeman. It has since been extended and enhanced pretty much by
* all sorts of friendly Rockbox people. * all sorts of friendly Rockbox people.
* *
*/ */

2
utils/hwstub/stub/jz4760b/jz4760b.h
View file

@ -7904,7 +7904,7 @@ do { \
#define SSI_CR1_MULTS (1 << 22) #define SSI_CR1_MULTS (1 << 22)
#define SSI_CR1_FMAT_BIT 20 #define SSI_CR1_FMAT_BIT 20
#define SSI_CR1_FMAT_MASK (0x3 << SSI_CR1_FMAT_BIT) #define SSI_CR1_FMAT_MASK (0x3 << SSI_CR1_FMAT_BIT)
#define SSI_CR1_FMAT_SPI (0 << SSI_CR1_FMAT_BIT) /* Motorola¡¯s SPI format */ #define SSI_CR1_FMAT_SPI (0 << SSI_CR1_FMAT_BIT) /* Motorola’s SPI format */
#define SSI_CR1_FMAT_SSP (1 << SSI_CR1_FMAT_BIT) /* TI's SSP format */ #define SSI_CR1_FMAT_SSP (1 << SSI_CR1_FMAT_BIT) /* TI's SSP format */
#define SSI_CR1_FMAT_MW1 (2 << SSI_CR1_FMAT_BIT) /* National Microwire 1 format */ #define SSI_CR1_FMAT_MW1 (2 << SSI_CR1_FMAT_BIT) /* National Microwire 1 format */
#define SSI_CR1_FMAT_MW2 (3 << SSI_CR1_FMAT_BIT) /* National Microwire 2 format */ #define SSI_CR1_FMAT_MW2 (3 << SSI_CR1_FMAT_BIT) /* National Microwire 2 format */

2
utils/jz4740_tools/jz4740.h
View file

@ -1335,7 +1335,7 @@
#define SSI_CR1_MULTS (1 << 22) #define SSI_CR1_MULTS (1 << 22)
#define SSI_CR1_FMAT_BIT 20 #define SSI_CR1_FMAT_BIT 20
#define SSI_CR1_FMAT_MASK (0x3 << SSI_CR1_FMAT_BIT) #define SSI_CR1_FMAT_MASK (0x3 << SSI_CR1_FMAT_BIT)
#define SSI_CR1_FMAT_SPI (0 << SSI_CR1_FMAT_BIT) /* Motorola¡¯s SPI format */ #define SSI_CR1_FMAT_SPI (0 << SSI_CR1_FMAT_BIT) /* Motorola’s SPI format */
#define SSI_CR1_FMAT_SSP (1 << SSI_CR1_FMAT_BIT) /* TI's SSP format */ #define SSI_CR1_FMAT_SSP (1 << SSI_CR1_FMAT_BIT) /* TI's SSP format */
#define SSI_CR1_FMAT_MW1 (2 << SSI_CR1_FMAT_BIT) /* National Microwire 1 format */ #define SSI_CR1_FMAT_MW1 (2 << SSI_CR1_FMAT_BIT) /* National Microwire 1 format */
#define SSI_CR1_FMAT_MW2 (3 << SSI_CR1_FMAT_BIT) /* National Microwire 2 format */ #define SSI_CR1_FMAT_MW2 (3 << SSI_CR1_FMAT_BIT) /* National Microwire 2 format */

6
utils/zenutils/notes.txt
View file

@ -23,13 +23,13 @@ Run firmware_extract on the firmware archive to obtain the files
updater executable which you originally extracted it from. The new updater updater executable which you originally extracted it from. The new updater
will update your player with the modifications you've made. will update your player with the modifications you've made.
* If you're creating or editing executable code, such as the CENC or ©TL entries, * If you're creating or editing executable code, such as the CENC or ©TL entries,
you'll need to use zen_crypt to decrypt and/or encrypt them. you'll need to use zen_crypt to decrypt and/or encrypt them.
In addition, executable code on some players that use the ©TL entries also needs In addition, executable code on some players that use the ©TL entries also needs
to be signed using zen_crypt, prior to encrypting them. to be signed using zen_crypt, prior to encrypting them.
Encrypting FBOOT and FRESC is not supported, as these contain the executable Encrypting FBOOT and FRESC is not supported, as these contain the executable
code that makes up the critical Rescue Mode software, contained in flash. code that makes up the critical Rescue Mode software, contained in flash.
As opposed to CENC and ©TL which ultimately ends up being stored in the players As opposed to CENC and ©TL which ultimately ends up being stored in the players
filesystem as a file named Jukebox2.jrm. filesystem as a file named Jukebox2.jrm.