Indented project.
This commit is contained in:
@@ -65,7 +65,8 @@ static bool Auto_Mode_Enabled;
|
||||
* RETURN: true if automode enabled
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
bool automac_enabled(void)
|
||||
bool automac_enabled(
|
||||
void)
|
||||
{
|
||||
return Auto_Mode_Enabled;
|
||||
}
|
||||
@@ -75,7 +76,8 @@ bool automac_enabled(void)
|
||||
* RETURN: nothing
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
void automac_enabled_set(bool status)
|
||||
void automac_enabled_set(
|
||||
bool status)
|
||||
{
|
||||
Auto_Mode_Enabled = status;
|
||||
}
|
||||
@@ -85,7 +87,8 @@ void automac_enabled_set(bool status)
|
||||
* RETURN: true if full
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
bool automac_pfm_cycle_complete(void)
|
||||
bool automac_pfm_cycle_complete(
|
||||
void)
|
||||
{
|
||||
return PFM_Cycle_Complete;
|
||||
}
|
||||
@@ -95,13 +98,13 @@ bool automac_pfm_cycle_complete(void)
|
||||
* RETURN: true if used
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
static bool automac_address_used(uint8_t mac)
|
||||
static bool automac_address_used(
|
||||
uint8_t mac)
|
||||
{
|
||||
bool status = false;
|
||||
|
||||
if (mac < MAC_SLOTS_MAX) {
|
||||
if ((Auto_MAC_Data[mac].emitter) ||
|
||||
(Auto_MAC_Data[mac].reserved) ||
|
||||
if ((Auto_MAC_Data[mac].emitter) || (Auto_MAC_Data[mac].reserved) ||
|
||||
(Auto_MAC_Data[mac].token)) {
|
||||
status = true;
|
||||
}
|
||||
@@ -115,13 +118,13 @@ static bool automac_address_used(uint8_t mac)
|
||||
* RETURN: true if valid
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
bool automac_free_address_valid(uint8_t mac)
|
||||
bool automac_free_address_valid(
|
||||
uint8_t mac)
|
||||
{
|
||||
bool status = false;
|
||||
|
||||
if (mac < MAC_SLOTS_MAX) {
|
||||
if ((Auto_MAC_Data[mac].pfm) &&
|
||||
(!automac_address_used(mac))) {
|
||||
if ((Auto_MAC_Data[mac].pfm) && (!automac_address_used(mac))) {
|
||||
status = true;
|
||||
}
|
||||
}
|
||||
@@ -134,11 +137,12 @@ bool automac_free_address_valid(uint8_t mac)
|
||||
* RETURN: Next_Station, or 255 if there are no next stations
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
uint8_t automac_next_station(uint8_t mac)
|
||||
uint8_t automac_next_station(
|
||||
uint8_t mac)
|
||||
{
|
||||
uint8_t i = 0; /* loop counter */
|
||||
uint8_t i = 0; /* loop counter */
|
||||
uint8_t next_station = 255; /* return value */
|
||||
uint8_t test_station = 0; /* station number to test for token */
|
||||
uint8_t test_station = 0; /* station number to test for token */
|
||||
|
||||
test_station = (mac + 1) % 128;
|
||||
for (i = 0; i < MAC_SLOTS_MAX; i++) {
|
||||
@@ -157,7 +161,8 @@ uint8_t automac_next_station(uint8_t mac)
|
||||
* RETURN: Number of free MAC addresses
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
uint8_t automac_free_address_count(void)
|
||||
uint8_t automac_free_address_count(
|
||||
void)
|
||||
{
|
||||
uint8_t i = 0;
|
||||
uint8_t slots = 0;
|
||||
@@ -176,7 +181,8 @@ uint8_t automac_free_address_count(void)
|
||||
* RETURN: Number of free MAC addresses
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
uint8_t automac_free_address_mac(uint8_t count)
|
||||
uint8_t automac_free_address_mac(
|
||||
uint8_t count)
|
||||
{
|
||||
uint8_t i = 0;
|
||||
uint8_t slots = 0;
|
||||
@@ -200,7 +206,8 @@ uint8_t automac_free_address_mac(uint8_t count)
|
||||
* RETURN: free MAC addresses
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
uint8_t automac_free_address_random(void)
|
||||
uint8_t automac_free_address_random(
|
||||
void)
|
||||
{
|
||||
uint8_t count = 0;
|
||||
uint8_t random_count = 0;
|
||||
@@ -208,7 +215,7 @@ uint8_t automac_free_address_random(void)
|
||||
|
||||
count = automac_free_address_count();
|
||||
if (count) {
|
||||
random_count = rand()%count;
|
||||
random_count = rand() % count;
|
||||
mac = automac_free_address_mac(random_count);
|
||||
}
|
||||
|
||||
@@ -220,7 +227,8 @@ uint8_t automac_free_address_random(void)
|
||||
* RETURN: MAC addresses
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
uint8_t automac_address(void)
|
||||
uint8_t automac_address(
|
||||
void)
|
||||
{
|
||||
return My_MAC_Address;
|
||||
}
|
||||
@@ -230,7 +238,8 @@ uint8_t automac_address(void)
|
||||
* RETURN: MAC addresses
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
void automac_address_set(uint8_t mac)
|
||||
void automac_address_set(
|
||||
uint8_t mac)
|
||||
{
|
||||
My_MAC_Address = mac;
|
||||
}
|
||||
@@ -240,7 +249,8 @@ void automac_address_set(uint8_t mac)
|
||||
* RETURN: MAC addresses
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
uint16_t automac_time_slot(void)
|
||||
uint16_t automac_time_slot(
|
||||
void)
|
||||
{
|
||||
return My_Time_Slot;
|
||||
}
|
||||
@@ -250,12 +260,14 @@ uint16_t automac_time_slot(void)
|
||||
* RETURN: MAC addresses
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
void automac_address_init(void)
|
||||
void automac_address_init(
|
||||
void)
|
||||
{
|
||||
My_MAC_Address = MAC_SLOTS_OFFSET + rand()%(MAC_SLOTS_MAX-MAC_SLOTS_OFFSET);
|
||||
My_MAC_Address =
|
||||
MAC_SLOTS_OFFSET + rand() % (MAC_SLOTS_MAX - MAC_SLOTS_OFFSET);
|
||||
/* at least as long as a dropped token - worst case */
|
||||
My_Time_Slot = Tno_token + (MAC_SLOTS_MAX * Tslot);
|
||||
My_Time_Slot += (uint16_t)My_MAC_Address * Tslot;
|
||||
My_Time_Slot += (uint16_t) My_MAC_Address *Tslot;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@@ -263,7 +275,8 @@ void automac_address_init(void)
|
||||
* RETURN: nothing
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
void automac_pfm_set(uint8_t mac)
|
||||
void automac_pfm_set(
|
||||
uint8_t mac)
|
||||
{
|
||||
if (mac < MAC_SLOTS_MAX) {
|
||||
if (Auto_MAC_Data[mac].pfm) {
|
||||
@@ -281,7 +294,8 @@ void automac_pfm_set(uint8_t mac)
|
||||
* RETURN: nothing
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
void automac_token_set(uint8_t mac)
|
||||
void automac_token_set(
|
||||
uint8_t mac)
|
||||
{
|
||||
if (mac < MAC_SLOTS_MAX) {
|
||||
Auto_MAC_Data[mac].token = true;
|
||||
@@ -293,7 +307,8 @@ void automac_token_set(uint8_t mac)
|
||||
* RETURN: nothing
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
void automac_emitter_set(uint8_t mac)
|
||||
void automac_emitter_set(
|
||||
uint8_t mac)
|
||||
{
|
||||
if (mac < MAC_SLOTS_MAX) {
|
||||
Auto_MAC_Data[mac].emitter = true;
|
||||
@@ -305,7 +320,8 @@ void automac_emitter_set(uint8_t mac)
|
||||
* RETURN: nothing
|
||||
* NOTES: none
|
||||
*****************************************************************************/
|
||||
void automac_init(void)
|
||||
void automac_init(
|
||||
void)
|
||||
{
|
||||
uint8_t i = 0;
|
||||
|
||||
@@ -359,34 +375,31 @@ void test_Auto_MAC(
|
||||
srand(42);
|
||||
mac = automac_free_address_random();
|
||||
ct_test(pTest, mac == 255);
|
||||
automac_pfm_set(MAC_SLOTS_OFFSET+1);
|
||||
automac_pfm_set(MAC_SLOTS_OFFSET + 1);
|
||||
mac = automac_free_address_mac(0);
|
||||
ct_test(pTest, mac == (MAC_SLOTS_OFFSET+1));
|
||||
ct_test(pTest, mac == (MAC_SLOTS_OFFSET + 1));
|
||||
mac = automac_free_address_random();
|
||||
ct_test(pTest, mac == (MAC_SLOTS_OFFSET+1));
|
||||
ct_test(pTest, mac == (MAC_SLOTS_OFFSET + 1));
|
||||
/* test 2 free addresses */
|
||||
automac_pfm_set(MAC_SLOTS_OFFSET+2);
|
||||
automac_pfm_set(MAC_SLOTS_OFFSET + 2);
|
||||
mac = automac_free_address_mac(0);
|
||||
ct_test(pTest, mac == (MAC_SLOTS_OFFSET+1));
|
||||
ct_test(pTest, mac == (MAC_SLOTS_OFFSET + 1));
|
||||
mac = automac_free_address_mac(1);
|
||||
ct_test(pTest, mac == (MAC_SLOTS_OFFSET+2));
|
||||
ct_test(pTest, mac == (MAC_SLOTS_OFFSET + 2));
|
||||
mac = automac_free_address_random();
|
||||
ct_test(pTest,
|
||||
(mac == (MAC_SLOTS_OFFSET+1)) ||
|
||||
(mac == (MAC_SLOTS_OFFSET+2)));
|
||||
ct_test(pTest, (mac == (MAC_SLOTS_OFFSET + 1)) ||
|
||||
(mac == (MAC_SLOTS_OFFSET + 2)));
|
||||
/* test 3 free addresses */
|
||||
automac_pfm_set(126);
|
||||
mac = automac_free_address_mac(0);
|
||||
ct_test(pTest, mac == (MAC_SLOTS_OFFSET+1));
|
||||
ct_test(pTest, mac == (MAC_SLOTS_OFFSET + 1));
|
||||
mac = automac_free_address_mac(1);
|
||||
ct_test(pTest, mac == (MAC_SLOTS_OFFSET+2));
|
||||
ct_test(pTest, mac == (MAC_SLOTS_OFFSET + 2));
|
||||
mac = automac_free_address_mac(2);
|
||||
ct_test(pTest, mac == 126);
|
||||
mac = automac_free_address_random();
|
||||
ct_test(pTest,
|
||||
(mac == (MAC_SLOTS_OFFSET+1))||
|
||||
(mac == (MAC_SLOTS_OFFSET+2))||
|
||||
(mac == 126));
|
||||
ct_test(pTest, (mac == (MAC_SLOTS_OFFSET + 1)) ||
|
||||
(mac == (MAC_SLOTS_OFFSET + 2)) || (mac == 126));
|
||||
/* test the stored address */
|
||||
mac = automac_address();
|
||||
ct_test(pTest, mac < MAC_SLOTS_MAX);
|
||||
@@ -423,4 +436,3 @@ int main(
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user