驱动优化
This commit is contained in:
@@ -26,7 +26,7 @@ OS_STATIC_FORCE_INLINE
|
||||
void node_init(rbtree_t* tree, rbtree_node_t * self, drv_device_t* val){
|
||||
self->left = self->right = self->parent = 0;
|
||||
self->color = RED;
|
||||
self->device = *val;
|
||||
self->device = val;
|
||||
}
|
||||
|
||||
OS_STATIC_FORCE_INLINE
|
||||
@@ -78,7 +78,7 @@ void rotate_right(rbtree_t* self, rbtree_node_t * y){
|
||||
|
||||
static rbtree_node_t * find(rbtree_t* self, const char* key, rbtree_node_t * x){
|
||||
while(x){
|
||||
int cmp = node_cmp(x->device.name, key);
|
||||
int cmp = node_cmp(key, x->device->name);
|
||||
if(cmp < 0){
|
||||
x = x->left;
|
||||
}else if(cmp > 0){
|
||||
@@ -201,7 +201,7 @@ void node_insert_fixup(rbtree_t* tree, rbtree_node_t * node){
|
||||
node_set_black(tree->root);
|
||||
}
|
||||
|
||||
OS_STATIC_FORCE_INLINE
|
||||
static
|
||||
void node_insert(rbtree_t* tree, rbtree_node_t * node){
|
||||
int cmp = 0;
|
||||
rbtree_node_t * y = NULL;
|
||||
@@ -210,7 +210,7 @@ void node_insert(rbtree_t* tree, rbtree_node_t * node){
|
||||
// 1. 将红黑树当作一颗二叉查找树,将节点添加到二叉查找树中。
|
||||
while (x) {
|
||||
y = x;
|
||||
cmp = node_cmp(node->device.name, x->device.name);
|
||||
cmp = node_cmp(node->device->name, x->device->name);
|
||||
if (cmp < 0)
|
||||
x = x->left;
|
||||
else
|
||||
@@ -223,7 +223,7 @@ void node_insert(rbtree_t* tree, rbtree_node_t * node){
|
||||
tree->root = node;
|
||||
}else{
|
||||
// 判断插入父节点的左边还是右边
|
||||
cmp = node_cmp(node->device.name, y->device.name);
|
||||
cmp = node_cmp(node->device->name, y->device->name);
|
||||
if(cmp < 0){
|
||||
y->left = node;
|
||||
}else{
|
||||
|
||||
Reference in New Issue
Block a user