post-guard/auto_bus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

搞错了

Browse Source
This commit is contained in:
nvhaizi1 2022-05-29 13:27:45 +08:00
parent f07233c1e6
commit f3ece808b1
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/controller.c
View File

@ -46,8 +46,16 @@ int FCFSDirection()
bus_query_t *FCFSQuery()
{
<<<<<<< HEAD
return NULL;
bus_query_t *p = queries;
if (the_bus->rail_node_pos == p->node)
{
return p;
}
else
{
queries = queries->next_node;
return NULL;
}
}
bus_query_t *SSTFGetQuery()
@ -78,16 +86,4 @@ int SCANDirection(bus_query_t *target_query)
bus_query_t *SCANBTWQuery()
{
return NULL;
=======
bus_query_t *p = queries;
if (the_bus->rail_node_pos == p->node)
{
return p;
}
else
{
queries = queries->next_node;
return NULL;
}
>>>>>>> dev
}