generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 9d43c079: am 4e882503: am a990cf5b: Merge "Clean up trailing whitespace in the kernel headers."

Browse Source 
# Via Android Git Automerger (2) and others
* commit '9d43c079875ebd2540daccb180e9d6d0fa06061d':
  Clean up trailing whitespace in the kernel headers.
This commit is contained in:
Elliott Hughes 2013-01-30 10:33:52 -08:00 committed by Android Git Automerger
commit 0243962d20
341 changed files with 6527 additions and 6635 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libc/kernel/README.TXT
View File

@ -60,13 +60,6 @@ the tools you can use are:
'external/kernel-headers/original'. this is the script you're likely going to
run whenever you update the original headers.
NOTE:
if ANDROID_PRODUCT_OUT is defined in your environment, both 'clean_header.py'
and 'update_all.py' will automatically issue "p4 add/edit/delete" commands
appropriately to reflect the changes being made.
you will need to "p4 submit" manually though...
HOW TO BUILD BIONIC AND OTHER PROGRAMS WITH THE CLEAN HEADERS:
==============================================================

1
libc/kernel/common/asm-generic/fcntl.h
View File

@ -189,4 +189,3 @@ struct flock64 {
};
#endif
#endif

1
libc/kernel/common/linux/fb.h
View File

@ -403,4 +403,3 @@ struct fb_cursor {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
#endif

1
libc/kernel/common/linux/genlock.h
View File

@ -43,4 +43,3 @@ struct genlock_lock {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define GENLOCK_IOC_DREADLOCK _IOW(GENLOCK_IOC_MAGIC, 6, struct genlock_lock)
#endif

2
libc/kernel/common/linux/icmp.h
View File

@ -79,7 +79,7 @@ struct icmphdr {
} echo;
__u32 gateway;
struct {
__u16 __unused_field;
__u16 __linux_unused;
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
__u16 mtu;
} frag;

1
libc/kernel/common/linux/idle_stats_device.h
View File

@ -56,4 +56,3 @@ struct msm_idle_write_stats {
#define MSM_IDLE_STATS_IOC_WRITE_STATS _IOWR(MSM_IDLE_STATS_IOC_MAGIC, 2, struct msm_idle_write_stats)
#endif
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

1
libc/kernel/common/linux/ion.h
View File

@ -69,4 +69,3 @@ struct ion_custom_data {
#define ION_IOC_SYNC _IOWR(ION_IOC_MAGIC, 7, struct ion_fd_data)
#define ION_IOC_CUSTOM _IOWR(ION_IOC_MAGIC, 6, struct ion_custom_data)
#endif

1
libc/kernel/common/linux/media.h
View File

@ -123,4 +123,3 @@ struct media_links_enum {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define MEDIA_IOC_SETUP_LINK _IOWR('|', 0x03, struct media_link_desc)
#endif

1
libc/kernel/common/linux/mfd/msm-adie-codec.h
View File

@ -107,4 +107,3 @@ struct adie_codec_operations {
};
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#endif

1
libc/kernel/common/linux/mfd/timpani-audio.h
View File

@ -4597,4 +4597,3 @@
#define TIMPANI_CDC_COMP_HALT_COMPANDER_HALT_M 0x1
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#endif

1
libc/kernel/common/linux/mfd/wcd9xxx/wcd9310_registers.h
View File

@ -1378,4 +1378,3 @@
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define TABLA_CODEC_UNPACK_ENTRY(packed, reg, mask, val) do { ((reg) = ((packed >> 16) & (0xffff))); ((mask) = ((packed >> 8) & (0xff))); ((val) = ((packed) & (0xff))); } while (0);
#endif

1
libc/kernel/common/linux/mfd/wcd9xxx/wcd9xxx_registers.h
View File

@ -52,4 +52,3 @@
#define WCD9XXX_A_LEAKAGE_CTL__POR (0x00000004)
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#endif

1
libc/kernel/common/linux/msm_audio.h
View File

@ -343,4 +343,3 @@ struct msm_acdb_cmd_device {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
#endif

1
libc/kernel/common/linux/msm_audio_aac.h
View File

@ -77,4 +77,3 @@ struct msm_audio_aac_enc_config {
};
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#endif

1
libc/kernel/common/linux/msm_audio_acdb.h
View File

@ -68,4 +68,3 @@ struct sidetone_cal {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define AUDIO_MAX_RTAC_IOCTL (AUDIO_MAX_ACDB_IOCTL+20)
#endif

1
libc/kernel/common/linux/msm_audio_wma.h
View File

@ -46,4 +46,3 @@ struct msm_audio_wma_config_v2 {
};
#endif
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

1
libc/kernel/common/linux/msm_audio_wmapro.h
View File

@ -38,4 +38,3 @@ struct msm_audio_wmapro_config {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
#endif

1
libc/kernel/common/linux/msm_charm.h
View File

@ -36,4 +36,3 @@ enum charm_boot_type {
};
#endif
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

1
libc/kernel/common/linux/msm_dsps.h
View File

@ -28,4 +28,3 @@
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define DSPS_IOCTL_RESET _IO(DSPS_IOCTL_MAGIC, 5)
#endif

1
libc/kernel/common/linux/msm_kgsl.h
View File

@ -363,4 +363,3 @@ struct kgsl_timestamp_event_fence {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define IOCTL_KGSL_TIMESTAMP_EVENT _IOWR(KGSL_IOC_TYPE, 0x33, struct kgsl_timestamp_event)
#endif

1
libc/kernel/common/linux/msm_mdp.h
View File

@ -528,4 +528,3 @@ enum {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
#endif

1
libc/kernel/common/linux/msm_rmnet.h
View File

@ -51,4 +51,3 @@ struct QMI_QOS_HDR_S {
};
#endif
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

1
libc/kernel/common/linux/msm_rotator.h
View File

@ -73,4 +73,3 @@ struct msm_rotator_platform_data {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
#endif

1
libc/kernel/common/linux/msm_vidc_dec.h
View File

@ -537,4 +537,3 @@ struct vdec_mv_buff_size{
};
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#endif

1
libc/kernel/common/linux/msm_vidc_enc.h
View File

@ -428,4 +428,3 @@ struct venc_recon_buff_size{
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
#endif

1
libc/kernel/common/linux/v4l2-mediabus.h
View File

@ -96,4 +96,3 @@ struct v4l2_mbus_framefmt {
};
#endif
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

1
libc/kernel/common/linux/videodev2.h
View File

@ -2178,4 +2178,3 @@ struct v4l2_create_buffers {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define BASE_VIDIOC_PRIVATE 192
#endif

1
libc/kernel/common/media/msm_camera.h
View File

@ -1868,4 +1868,3 @@ struct msm_ver_num_info {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define SET_VIDEO_INST_IDX(handle, data) (handle |= (0x1 << 7) | (data & 0x7F))
#endif

1
libc/kernel/common/media/msm_gestures.h
View File

@ -59,4 +59,3 @@ struct msm_ges_evt {
int evt_len;
};
#endif

1
libc/kernel/common/media/msm_isp.h
View File

@ -427,4 +427,3 @@ struct msm_frame_info {
};
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#endif

1
libc/kernel/common/media/v4l2-mediabus.h
View File

@ -62,4 +62,3 @@ struct v4l2_mbus_config {
};
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#endif

1
libc/kernel/common/sound/tlv.h
View File

@ -42,4 +42,3 @@
#define TLV_DB_GAIN_MUTE -9999999
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#endif

4
libc/kernel/tools/cpp.py
View File

@ -1676,7 +1676,7 @@ class Block:
return left_count
if self.directive:
out.write(str(self) + "\n")
out.write(str(self).rstrip() + "\n")
left_count -= 1
if left_count == 0:
out.write(warning)
@ -1756,7 +1756,7 @@ class BlockList:
for b in self.blocks:
result += str(b)
if b.isDirective():
result += '\n'
result = result.rstrip() + '\n'
return result
def optimizeIf01(self):

5
libc/kernel/tools/update_all.py
View File

@ -16,11 +16,6 @@ def usage():
- the clean headers will be placed in '../arch-<arch>/asm',
'../common/linux', '../common/asm-generic', etc..
- if ANDROID_PRODUCT_OUT is defined in your environment, you're
using the Android build system, and the program will issue
p4 add / edit / delete commands to update the depot for you.
(you'll need to p4 submit manually though)
""" % { "progname" : os.path.basename(sys.argv[0]) }
sys.exit(0)

47
libc/kernel/tools/utils.py
View File

@ -184,17 +184,6 @@ class SysCallsTxtParser:
fp.close()
class Output:
def __init__(self,out=sys.stdout):
self.out = out
def write(self,msg):
self.out.write(msg)
def writeln(self,msg):
self.out.write(msg)
self.out.write("\n")
class StringOutput:
def __init__(self):
self.line = ""
@ -203,10 +192,6 @@ class StringOutput:
self.line += msg
D2("write '%s'" % msg)
def writeln(self,msg):
self.line += msg + '\n'
D2("write '%s\\n'"% msg)
def get(self):
return self.line
@ -356,11 +341,9 @@ class BatchFileUpdater:
return (adds, deletes, edits)
def _writeFile(self,dst,data=None):
def _writeFile(self,dst):
if not os.path.exists(os.path.dirname(dst)):
create_file_path(dst)
if data == None:
data = self.new_data[dst]
f = open(dst, "w")
f.write(self.new_data[dst])
f.close()
@ -377,34 +360,6 @@ class BatchFileUpdater:
for dst in sorted(deletes):
os.remove(dst)
def updateP4Files(self):
adds, deletes, edits = self.getChanges()
if len(adds):
files = string.join(sorted(adds)," ")
D( "%d new files will be p4 add-ed" % len(adds) )
for dst in adds:
self._writeFile(dst)
D2("P4 ADDS: %s" % files)
o = commands.getoutput( "p4 add " + files )
D2( o )
if len(edits):
files = string.join(sorted(edits)," ")
D( "%d files will be p4 edit-ed" % len(edits) )
D2("P4 EDITS: %s" % files)
o = commands.getoutput( "p4 edit " + files )
D2( o )
for dst in edits:
self._writeFile(dst)
if len(deletes):
files = string.join(sorted(deletes)," ")
D( "%d files will be p4 delete-d" % len(deletes) )
D2("P4 DELETES: %s" % files)
o = commands.getoutput( "p4 delete " + files )
D2( o )
def updateGitFiles(self):
adds, deletes, edits = self.getChanges()

15
libc/tools/bionic_utils.py
View File

@ -302,17 +302,6 @@ class SysCallsTxtParser:
fp.close()
class Output:
def __init__(self,out=sys.stdout):
self.out = out
def write(self,msg):
self.out.write(msg)
def writeln(self,msg):
self.out.write(msg)
self.out.write("\n")
class StringOutput:
def __init__(self):
self.line = ""
@ -321,10 +310,6 @@ class StringOutput:
self.line += msg
D2("write '%s'" % msg)
def writeln(self,msg):
self.line += msg + '\n'
D2("write '%s\\n'"% msg)
def get(self):
return self.line

6
libc/tools/gensyscalls.py
View File

@ -533,12 +533,6 @@ class State:
D( "creating %s" % bionic_temp )
make_dir( bionic_temp )
# D( "p4 editing source files" )
# for arch in all_archs:
# commands.getoutput( "p4 edit " + arch + "/syscalls/*.S " )
# commands.getoutput( "p4 edit " + arch + "/syscalls.mk" )
# commands.getoutput( "p4 edit " + bionic_root + "include/sys/linux-syscalls.h" )
D( "re-generating stubs and support files" )
self.gen_linux_syscalls_h()