aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorNicolas Schodet2024-08-15 20:27:03 +0200
committerNicolas Schodet2024-08-15 20:37:51 +0200
commit141cf850a9a252809ab00c5f56ce3206efea448e (patch)
treee11d698eb628f15cae4b375f7cb95651f6b2a95a /src
parente180b304422b30a3f5a3f4545edfb559bcb475e7 (diff)
Fix some warnings
Just a selection of easy to fix warnings.
Diffstat (limited to 'src')
-rw-r--r--src/Functions.inl40
-rw-r--r--src/c_cmd.c6
-rw-r--r--src/c_cmd_drawing.inc14
-rw-r--r--src/c_comm.c1
-rw-r--r--src/c_input.c4
-rw-r--r--src/c_ui.c2
-rw-r--r--src/d_display.r2
-rw-r--r--src/d_input.r2
-rw-r--r--src/d_loader.c2
-rw-r--r--src/sam7s256.c2
10 files changed, 37 insertions, 38 deletions
diff --git a/src/Functions.inl b/src/Functions.inl
index 4bf1ebe..05295db 100644
--- a/src/Functions.inl
+++ b/src/Functions.inl
@@ -274,11 +274,11 @@ void cUiUpdateSensor(SWORD Time)
{
if (VarsUi.SensorReset == TRUE)
{
- cUiWriteLowspeed(Port,3,"\x02\x41\x02",0);
+ cUiWriteLowspeed(Port,3,(UBYTE *)"\x02\x41\x02",0);
}
if (VarsUi.SensorState == SENSOR_ACQUIRE)
{
- cUiWriteLowspeed(Port,2,"\x02\x42",1);
+ cUiWriteLowspeed(Port,2,(UBYTE *)"\x02\x42",1);
}
if (VarsUi.SensorState == SENSOR_READ)
{
@@ -307,11 +307,11 @@ void cUiUpdateSensor(SWORD Time)
{
if (VarsUi.SensorState == SENSOR_SETUP)
{
- cUiWriteLowspeed(Port,3,"\x98\x01\x60",0);
+ cUiWriteLowspeed(Port,3,(UBYTE *)"\x98\x01\x60",0);
}
if (VarsUi.SensorState == SENSOR_ACQUIRE)
{
- cUiWriteLowspeed(Port,2,"\x98\x00",2);
+ cUiWriteLowspeed(Port,2,(UBYTE *)"\x98\x00",2);
}
if (VarsUi.SensorState == SENSOR_READ)
{
@@ -3516,7 +3516,7 @@ UBYTE cUiBtConnectList(UBYTE Action) // Show connections and maybe disconnec
case MENU_UPDATE : // Check connection valid
{
VarsUi.Tmp = VarsUi.SlotCenter - 1;
- if (cUiBTCommand(UI_BT_GET_CONNECTION_VALID,NULL,&VarsUi.Tmp,NULL) != UI_BT_SUCCES)
+ if (cUiBTCommand(UI_BT_GET_CONNECTION_VALID,0,&VarsUi.Tmp,NULL) != UI_BT_SUCCES)
{
Action = MENU_EXIT;
}
@@ -3583,9 +3583,9 @@ UBYTE cUiBtConnectList(UBYTE Action) // Show connections and maybe disconnec
pMapDisplay->pBitmaps[BITMAP_4] = (BMPMAP*)VarsUi.PortBitmapRight;
VarsUi.Tmp = VarsUi.SlotLeft - 1;
- if (cUiBTCommand(UI_BT_GET_CONNECTION_VALID,NULL,&VarsUi.Tmp,NULL) == UI_BT_SUCCES)
+ if (cUiBTCommand(UI_BT_GET_CONNECTION_VALID,0,&VarsUi.Tmp,NULL) == UI_BT_SUCCES)
{
- cUiBTCommand(UI_BT_GET_CONNECTION_TYPE,NULL,&VarsUi.Tmp,&VarsUi.DeviceType);
+ cUiBTCommand(UI_BT_GET_CONNECTION_TYPE,0,&VarsUi.Tmp,&VarsUi.DeviceType);
pMapDisplay->pMenuIcons[MENUICON_LEFT] = (UBYTE*)&Devices.Data[VarsUi.DeviceType * Devices.ItemPixelsX * (Devices.ItemPixelsY / 8)];
cUiDrawPortNo(VarsUi.PortBitmapLeft,MENUICON_LEFT,VarsUi.Tmp);
pMapDisplay->UpdateMask |= BITMAP_BIT(BITMAP_2);
@@ -3596,13 +3596,13 @@ UBYTE cUiBtConnectList(UBYTE Action) // Show connections and maybe disconnec
}
VarsUi.Tmp = VarsUi.SlotCenter - 1;
- cUiBTCommand(UI_BT_GET_CONNECTION_NAME,NULL,&VarsUi.Tmp,VarsUi.DisplayBuffer);
+ cUiBTCommand(UI_BT_GET_CONNECTION_NAME,0,&VarsUi.Tmp,VarsUi.DisplayBuffer);
pMapDisplay->EraseMask |= TEXTLINE_BIT(TEXTLINE_5);
pMapDisplay->pMenuText = VarsUi.DisplayBuffer;
- if (cUiBTCommand(UI_BT_GET_CONNECTION_VALID,NULL,&VarsUi.Tmp,NULL) == UI_BT_SUCCES)
+ if (cUiBTCommand(UI_BT_GET_CONNECTION_VALID,0,&VarsUi.Tmp,NULL) == UI_BT_SUCCES)
{
- cUiBTCommand(UI_BT_GET_CONNECTION_TYPE,NULL,&VarsUi.Tmp,&VarsUi.DeviceType);
+ cUiBTCommand(UI_BT_GET_CONNECTION_TYPE,0,&VarsUi.Tmp,&VarsUi.DeviceType);
pMapDisplay->pMenuIcons[MENUICON_CENTER] = (UBYTE*)&Devices.Data[VarsUi.DeviceType * Devices.ItemPixelsX * (Devices.ItemPixelsY / 8)];
cUiDrawPortNo(VarsUi.PortBitmapCenter,MENUICON_CENTER,VarsUi.Tmp);
pMapDisplay->UpdateMask |= BITMAP_BIT(BITMAP_3);
@@ -3612,9 +3612,9 @@ UBYTE cUiBtConnectList(UBYTE Action) // Show connections and maybe disconnec
pMapDisplay->pMenuIcons[MENUICON_CENTER] = (UBYTE*)&Connections.Data[VarsUi.Tmp * Connections.ItemPixelsX * (Connections.ItemPixelsY / 8)];
}
VarsUi.Tmp = VarsUi.SlotRight - 1;
- if (cUiBTCommand(UI_BT_GET_CONNECTION_VALID,NULL,&VarsUi.Tmp,NULL) == UI_BT_SUCCES)
+ if (cUiBTCommand(UI_BT_GET_CONNECTION_VALID,0,&VarsUi.Tmp,NULL) == UI_BT_SUCCES)
{
- cUiBTCommand(UI_BT_GET_CONNECTION_TYPE,NULL,&VarsUi.Tmp,&VarsUi.DeviceType);
+ cUiBTCommand(UI_BT_GET_CONNECTION_TYPE,0,&VarsUi.Tmp,&VarsUi.DeviceType);
pMapDisplay->pMenuIcons[MENUICON_RIGHT] = (UBYTE*)&Devices.Data[VarsUi.DeviceType * Devices.ItemPixelsX * (Devices.ItemPixelsY / 8)];
cUiDrawPortNo(VarsUi.PortBitmapRight,MENUICON_RIGHT,VarsUi.Tmp);
pMapDisplay->UpdateMask |= BITMAP_BIT(BITMAP_4);
@@ -3811,7 +3811,7 @@ UBYTE cUiBtConnect(UBYTE Action) // Select connection no and insert device
case 0 : // Check connection
{
VarsUi.SelectedSlot = (UBYTE)VarsUi.SlotCenter;
- if (VarsUi.SelectedFilename[0] && (cUiBTCommand(UI_BT_GET_CONNECTION_NAME,NULL,&VarsUi.SelectedSlot,NULL) == UI_BT_SUCCES))
+ if (VarsUi.SelectedFilename[0] && (cUiBTCommand(UI_BT_GET_CONNECTION_NAME,0,&VarsUi.SelectedSlot,NULL) == UI_BT_SUCCES))
{
VarsUi.State += 2;
}
@@ -3900,9 +3900,9 @@ UBYTE cUiBtConnect(UBYTE Action) // Select connection no and insert device
pMapDisplay->pBitmaps[BITMAP_4] = (BMPMAP*)VarsUi.PortBitmapRight;
VarsUi.Tmp = VarsUi.SlotLeft;
- if (cUiBTCommand(UI_BT_GET_CONNECTION_VALID,NULL,&VarsUi.Tmp,NULL) == UI_BT_SUCCES)
+ if (cUiBTCommand(UI_BT_GET_CONNECTION_VALID,0,&VarsUi.Tmp,NULL) == UI_BT_SUCCES)
{
- cUiBTCommand(UI_BT_GET_CONNECTION_TYPE,NULL,&VarsUi.Tmp,&VarsUi.DeviceType);
+ cUiBTCommand(UI_BT_GET_CONNECTION_TYPE,0,&VarsUi.Tmp,&VarsUi.DeviceType);
pMapDisplay->pMenuIcons[MENUICON_LEFT] = (UBYTE*)&Devices.Data[VarsUi.DeviceType * Devices.ItemPixelsX * (Devices.ItemPixelsY / 8)];
cUiDrawPortNo(VarsUi.PortBitmapLeft,MENUICON_LEFT,VarsUi.Tmp);
pMapDisplay->UpdateMask |= BITMAP_BIT(BITMAP_2);
@@ -3913,13 +3913,13 @@ UBYTE cUiBtConnect(UBYTE Action) // Select connection no and insert device
}
VarsUi.Tmp = VarsUi.SlotCenter;
- cUiBTCommand(UI_BT_GET_CONNECTION_NAME,NULL,&VarsUi.Tmp,VarsUi.DisplayBuffer);
+ cUiBTCommand(UI_BT_GET_CONNECTION_NAME,0,&VarsUi.Tmp,VarsUi.DisplayBuffer);
pMapDisplay->EraseMask |= TEXTLINE_BIT(TEXTLINE_5);
pMapDisplay->pMenuText = VarsUi.DisplayBuffer;
- if (cUiBTCommand(UI_BT_GET_CONNECTION_VALID,NULL,&VarsUi.Tmp,NULL) == UI_BT_SUCCES)
+ if (cUiBTCommand(UI_BT_GET_CONNECTION_VALID,0,&VarsUi.Tmp,NULL) == UI_BT_SUCCES)
{
- cUiBTCommand(UI_BT_GET_CONNECTION_TYPE,NULL,&VarsUi.Tmp,&VarsUi.DeviceType);
+ cUiBTCommand(UI_BT_GET_CONNECTION_TYPE,0,&VarsUi.Tmp,&VarsUi.DeviceType);
pMapDisplay->pMenuIcons[MENUICON_CENTER] = (UBYTE*)&Devices.Data[VarsUi.DeviceType * Devices.ItemPixelsX * (Devices.ItemPixelsY / 8)];
cUiDrawPortNo(VarsUi.PortBitmapCenter,MENUICON_CENTER,VarsUi.Tmp);
pMapDisplay->UpdateMask |= BITMAP_BIT(BITMAP_3);
@@ -3929,9 +3929,9 @@ UBYTE cUiBtConnect(UBYTE Action) // Select connection no and insert device
pMapDisplay->pMenuIcons[MENUICON_CENTER] = (UBYTE*)&Connections.Data[VarsUi.Tmp * Connections.ItemPixelsX * (Connections.ItemPixelsY / 8)];
}
VarsUi.Tmp = VarsUi.SlotRight;
- if (cUiBTCommand(UI_BT_GET_CONNECTION_VALID,NULL,&VarsUi.Tmp,NULL) == UI_BT_SUCCES)
+ if (cUiBTCommand(UI_BT_GET_CONNECTION_VALID,0,&VarsUi.Tmp,NULL) == UI_BT_SUCCES)
{
- cUiBTCommand(UI_BT_GET_CONNECTION_TYPE,NULL,&VarsUi.Tmp,&VarsUi.DeviceType);
+ cUiBTCommand(UI_BT_GET_CONNECTION_TYPE,0,&VarsUi.Tmp,&VarsUi.DeviceType);
pMapDisplay->pMenuIcons[MENUICON_RIGHT] = (UBYTE*)&Devices.Data[VarsUi.DeviceType * Devices.ItemPixelsX * (Devices.ItemPixelsY / 8)];
cUiDrawPortNo(VarsUi.PortBitmapRight,MENUICON_RIGHT,VarsUi.Tmp);
pMapDisplay->UpdateMask |= BITMAP_BIT(BITMAP_4);
diff --git a/src/c_cmd.c b/src/c_cmd.c
index 470abbf..ffd5063 100644
--- a/src/c_cmd.c
+++ b/src/c_cmd.c
@@ -2230,7 +2230,7 @@ NXT_STATUS cCmdAcquireMutex(MUTEX_Q * Mutex)
NXT_STATUS cCmdReleaseMutex(MUTEX_Q * Mutex)
{
-#if WIN_DEBUG || defined(ARM_DEBUG)
+#if defined(WIN_DEBUG) || defined(ARM_DEBUG)
CLUMP_ID Clump= VarsCmd.RunQ.Head;
#endif
NXT_ASSERT(Mutex != NULL);
@@ -2500,7 +2500,7 @@ NXT_STATUS cCmdDVArrayAlloc(DV_INDEX DVIndex, UWORD NewCount)
if(OldCount)
memmove(pData, VarsCmd.pDataspace + DV_ARRAY[DVIndex].Offset, (UWORD)(DV_ARRAY[DVIndex].ElemSize * OldCount));
//!!! Clear mem so old mem doesn't contain stale data. Not strictly needed.
-#if WIN_DEBUG || defined(ARM_DEBUG)
+#if defined(WIN_DEBUG) || defined(ARM_DEBUG)
memset(VarsCmd.pDataspace + DV_ARRAY[DVIndex].Offset, 0xFF, (UWORD)(DV_ARRAY[DVIndex].ElemSize * OldCount));
#endif
//Update dope vector
@@ -7921,7 +7921,7 @@ void cCmdLoadCalibrationFiles(void) {
gCalibCacheCnt= 0;
gCalibCacheArrayDVIdx= NOT_A_DS_ID;
// file I/O to load all .cal files into cached globals used by scaling syscall
- HandleSearch = pMapLoader->pFunc(FINDFIRST, "*.cal", nm, &cnt); // returns total files and nm of first one
+ HandleSearch = pMapLoader->pFunc(FINDFIRST, (UBYTE *)"*.cal", nm, &cnt); // returns total files and nm of first one
while (LOADER_ERR(HandleSearch) == SUCCESS) { // if we have a file, process it by closing and opening
SWORD min= 0, max= 0, tmp;
ULONG length;
diff --git a/src/c_cmd_drawing.inc b/src/c_cmd_drawing.inc
index 0132d44..c6103a8 100644
--- a/src/c_cmd_drawing.inc
+++ b/src/c_cmd_drawing.inc
@@ -491,21 +491,21 @@ NXT_STATUS cCmdWrapDrawPicture(UBYTE * ArgV[])
{
case IMG_SPRITE_ID:
{
- if (OpSize >= sizeof(IMG_OP_SPRITE))
+ if (OpSize >= (SLONG)sizeof(IMG_OP_SPRITE))
cCmdSetIMGData(pImage->Sprite.DataAddr, pImage);
}
break;
case IMG_VARMAP_ID:
{
- if (OpSize >= sizeof(IMG_OP_VARMAP))
+ if (OpSize >= (SLONG)sizeof(IMG_OP_VARMAP))
cCmdSetIMGData(pImage->VarMap.DataAddr, pImage);
}
break;
case IMG_COPYBITS_ID:
{
- if (OpSize >= sizeof(IMG_OP_COPYBITS))
+ if (OpSize >= (SLONG)sizeof(IMG_OP_COPYBITS))
{
IMG_OP_COPYBITS * pCB = &(pImage->CopyBits);
cCmdCopyBitMapBits(
@@ -522,7 +522,7 @@ NXT_STATUS cCmdWrapDrawPicture(UBYTE * ArgV[])
case IMG_LINE_ID:
{
- if (OpSize >= sizeof(IMG_OP_LINE))
+ if (OpSize >= (SLONG)sizeof(IMG_OP_LINE))
{
IMG_OP_LINE * pL = &(pImage->Line);
cCmdDrawLine(
@@ -537,7 +537,7 @@ NXT_STATUS cCmdWrapDrawPicture(UBYTE * ArgV[])
case IMG_RECTANGLE_ID:
{
- if (OpSize >= sizeof(IMG_OP_LINE))
+ if (OpSize >= (SLONG)sizeof(IMG_OP_LINE))
{
IMG_OP_RECT * pL = &(pImage->Rect);
cCmdDrawRect(
@@ -552,7 +552,7 @@ NXT_STATUS cCmdWrapDrawPicture(UBYTE * ArgV[])
case IMG_PIXEL_ID:
{
- if (OpSize >= sizeof(IMG_OP_PIXEL))
+ if (OpSize >= (SLONG)sizeof(IMG_OP_PIXEL))
{
cCmdSetPixel(
(cCmdResolveValue(pImage->Pixel.Pt.X) + Pt.X),
@@ -564,7 +564,7 @@ NXT_STATUS cCmdWrapDrawPicture(UBYTE * ArgV[])
case IMG_NUMBOX_ID:
{
- if (OpSize >= sizeof(IMG_OP_NUMBOX))
+ if (OpSize >= (SLONG)sizeof(IMG_OP_NUMBOX))
{
UBYTE NumStr[20];
IMG_OP_NUMBOX * pNB = &(pImage->NumBox);
diff --git a/src/c_comm.c b/src/c_comm.c
index 176a1ff..0a32161 100644
--- a/src/c_comm.c
+++ b/src/c_comm.c
@@ -3519,6 +3519,7 @@ UWORD cCommReq(UBYTE Cmd, UBYTE Param1, UBYTE Param2, UBYTE Param3, UBYTE *p
foundIndex= cCommSearchBTDevTableForName(pName);
if(foundIndex != -1)
Param1= foundIndex;
+ /* fall through */
case CONNECT:
{
diff --git a/src/c_input.c b/src/c_input.c
index 2cb9be1..1a93646 100644
--- a/src/c_input.c
+++ b/src/c_input.c
@@ -1126,13 +1126,13 @@ SWORD cInputTempConv(UWORD InputVal)
2573629857807ll, -822478326197838ll, 195856762719738784ll };
const unsigned int TempCoeffShift = 48;
/* Replace the original table with polynomial. */
- int i;
+ unsigned i;
long long Input = InputVal;
long long Output = TempCoeff[0];
for (i = 1; i < sizeof TempCoeff / sizeof TempCoeff[0]; i++)
Output = Output * Input + TempCoeff[i];
/* Round. */
- return Output + (1ll << TempCoeffShift - 1) >> TempCoeffShift;
+ return (Output + (1ll << (TempCoeffShift - 1))) >> TempCoeffShift;
}
diff --git a/src/c_ui.c b/src/c_ui.c
index 83f266c..33939f8 100644
--- a/src/c_ui.c
+++ b/src/c_ui.c
@@ -557,7 +557,7 @@ UBYTE cUiMenuSearchSensorIcon(UBYTE Sensor)
MENUITEM *MenuItem;
UBYTE Index;
- for (Index = 0;(Index < IOMapUi.pMenu->Items) && (Result == NULL);Index++)
+ for (Index = 0;(Index < IOMapUi.pMenu->Items) && (Result == 0);Index++)
{
MenuItem = &IOMapUi.pMenu->Data[Index];
if (MenuItem->FunctionParameter == Sensor)
diff --git a/src/d_display.r b/src/d_display.r
index e38bb45..2d1c8bb 100644
--- a/src/d_display.r
+++ b/src/d_display.r
@@ -46,8 +46,6 @@
#define BT_MISO_OUT AT91C_PIO_PA6
#define BT_MISO_IN AT91C_PIO_PA12
-#pragma optimize=s 9
-
__ramfunc void SpiBtIo(void)
{
register ULONG Port;
diff --git a/src/d_input.r b/src/d_input.r
index 3dc567e..34ab917 100644
--- a/src/d_input.r
+++ b/src/d_input.r
@@ -200,7 +200,7 @@ static ULONG ColorTimer[NO_OF_INPUTS];
#define CALDataRead(Port, pData) {\
UBYTE BitCnt; \
- UBYTE Data; \
+ UBYTE Data = 0; \
BitCnt = 0; \
INPUTClkHigh(Port); \
rInputWait2uS(); \
diff --git a/src/d_loader.c b/src/d_loader.c
index a5ceb7d..3520760 100644
--- a/src/d_loader.c
+++ b/src/d_loader.c
@@ -799,7 +799,7 @@ ULONG dLoaderReturnFreeFlash(void)
ULONG dLoaderCalcFreeFileSpace(UWORD NosOfFreeSectors)
{
UWORD SectorCnt;
- ULONG Space;
+ ULONG Space = 0;
ULONG HeaderSpace;
/* Calculate only if any sectors available */
diff --git a/src/sam7s256.c b/src/sam7s256.c
index b2657d5..d1d45af 100644
--- a/src/sam7s256.c
+++ b/src/sam7s256.c
@@ -15,7 +15,7 @@
#include "debug_stub.h"
#endif
-void main(void)
+int main(void)
{
while(TRUE)
{