Merge branch 'master' of http://1.116.144.8:6314/joe/C180_oyster_driver

Readme.md

@@ -14,12 +14,12 @@ $ make
 
 ```
 # 加载
-$ sudo insmod coral.ko
+$ sudo insmod opal.ko
 # 检查加载是否成功
-$ lsmod | grep coral
+$ lsmod | grep opal
 
 # 卸载
-$ sudo rmmod coral
+$ sudo rmmod opal.ko
 
 ```
 

batteryled.c

@@ -197,7 +197,7 @@ static ssize_t led_health_show(struct kobject *kobj,
 
     ret = oem_ec_read_ram(2, 0x31, &data);
 
-    return sprintf(buf, "%02x\n", data);
+    return sprintf(buf, "%02x\n", led_health_val);
 }
 
 static ssize_t led_health_store(struct kobject *kobj,
@@ -237,7 +237,7 @@ static ssize_t led_charge_show(struct kobject *kobj, struct kobj_attribute *attr
 
     ret = oem_ec_read_ram(2, 0x31, &data);
 
-    return sprintf(buf, "%02x\n", data);
+    return sprintf(buf, "%02x\n", led_charge_val);
 }
 
 static ssize_t led_charge_store(struct kobject *kobj, struct kobj_attribute *attr,

cash_drawers.c

@@ -182,7 +182,7 @@ static ssize_t cashd_write(struct file *filp, const char __user *buf,
         value = readl(dev->gpio_ctl_reg_base);
         value |= 0x1;
         writel(value, dev->gpio_ctl_reg_base);
-        schedule_delayed_work(&dev->delay_work1, msecs_to_jiffies(3000));
+        schedule_delayed_work(&dev->delay_work1, msecs_to_jiffies(300));
     }
     else
     {

ec_version.c

@@ -104,9 +104,8 @@ static ssize_t fw_version_show(struct kobject *kobj, struct kobj_attribute *attr
         oem_ec_read_ram(2, i, &data[i]);
     }
     // This needs to be completed here, obtain the real version number
-    sprintf(buf, "%02x%02x%02x%02x", data[0], data[1], data[2], data[3]);
+    return sprintf(buf, "%02x%02x%02x%02x\n", data[0], data[1], data[2], data[3]);
 
-    return 8;
 }
 
 static ssize_t fw_version_store(struct kobject *kobj, struct kobj_attribute *attr,

power.c

@@ -272,8 +272,12 @@ static void delay_work_func(struct work_struct *work)
     {
         rst_flag = 0;
     }
-
+#if defined(PROJECT) && (PROJECT == POS)
+    if(ac_flag >= 8)
+#else
+#define DEVICE_NAME "buzzer"
     if(ac_flag >= 16)
+#endif
     {
         chardev_dev->status = 'p';
         chardev_dev->data_len = 1;

sysfs_power.c

@@ -232,7 +232,7 @@ static ssize_t ac_power_show(struct kobject *kobj, struct kobj_attribute *attr,
         return -1;
     ac_power_flag = (val  & 0x03) ? 1 : 0;
 
-	return sprintf(buf, "%d", ac_power_flag);
+	return sprintf(buf, "%d\n", ac_power_flag);
 }
 
 static ssize_t ac_power_store(struct kobject *kobj, struct kobj_attribute *attr,